[Libreoffice-commits] core.git: 40 commits - avmedia/inc basctl/inc basic/inc chart2/source cui/source dbaccess/inc dbaccess/source desktop/source editeng/inc extensions/source external/jpeg filter/inc filter/source forms/source formula/source fpicker/source framework/inc i18npool/source include/editeng include/i18nlangtag include/oox include/sfx2 include/svl include/svtools include/svx include/tools include/vcl include/xmloff reportdesign/inc reportdesign/source scaddins/source sc/inc sc/source sdext/source sd/inc sd/source sfx2/inc sfx2/source starmath/inc svtools/source svx/inc svx/source sw/inc sw/source writerperfect/source xmloff/inc xmloff/source xmlsecurity/inc xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 12 18:04:12 UTC 2016
avmedia/inc/helpids.hrc | 6
basctl/inc/helpid.hrc | 4
basic/inc/sb.hrc | 4
chart2/source/controller/dialogs/ResourceIds.hrc | 4
cui/source/dialogs/fmsearch.hrc | 6
cui/source/inc/cuires.hrc | 4
cui/source/inc/helpid.hrc | 4
cui/source/options/optsave.hrc | 6
cui/source/tabpages/align.hrc | 4
cui/source/tabpages/border.hrc | 4
cui/source/tabpages/paragrph.hrc | 4
dbaccess/inc/dbaccess_helpid.hrc | 6
dbaccess/inc/dbaccess_slotid.hrc | 6
dbaccess/source/core/inc/core_resource.hrc | 6
dbaccess/source/core/inc/dbamiscres.hrc | 6
dbaccess/source/inc/stringconstants.hrc | 6
dbaccess/source/ui/app/dbu_app.hrc | 6
dbaccess/source/ui/inc/dbu_brw.hrc | 6
dbaccess/source/ui/inc/dbu_control.hrc | 6
dbaccess/source/ui/inc/dbu_dlg.hrc | 6
dbaccess/source/ui/inc/dbu_misc.hrc | 6
dbaccess/source/ui/inc/dbu_qry.hrc | 6
dbaccess/source/ui/inc/dbu_rel.hrc | 6
dbaccess/source/ui/inc/dbu_resource.hrc | 6
dbaccess/source/ui/inc/dbu_tbl.hrc | 6
dbaccess/source/ui/inc/dbu_uno.hrc | 6
desktop/source/app/desktop.hrc | 7
editeng/inc/editeng.hrc | 6
editeng/inc/helpid.hrc | 4
extensions/source/bibliography/bibprop.hrc | 6
extensions/source/dbpilots/dbpresid.hrc | 6
extensions/source/propctrlr/formlocalid.hrc | 6
extensions/source/propctrlr/formresid.hrc | 6
external/jpeg/patches/jpeg-8c-jmorecfg.patch | 2
filter/inc/filter.hrc | 4
filter/source/t602/t602filter.cxx | 354 +++++-----
filter/source/xsltdialog/xmlfilterdialogstrings.hrc | 4
forms/source/inc/frm_resource.hrc | 6
forms/source/inc/property.hrc | 6
formula/source/core/inc/core_resource.hrc | 6
fpicker/source/office/OfficeFilePicker.hrc | 4
fpicker/source/office/iodlg.hrc | 4
framework/inc/classes/resource.hrc | 4
framework/inc/helpid.hrc | 4
i18npool/source/inputchecker/inputsequencechecker_hi.cxx | 62 -
include/editeng/editids.hrc | 4
include/editeng/editrids.hrc | 4
include/editeng/memberids.hrc | 4
include/i18nlangtag/lang.h | 8
include/oox/ole/vbaexport.hxx | 4
include/sfx2/cntids.hrc | 4
include/sfx2/dialogs.hrc | 4
include/sfx2/sfx.hrc | 6
include/sfx2/sfxsids.hrc | 6
include/sfx2/sidebar/ResourceDefinitions.hrc | 6
include/svl/memberid.hrc | 4
include/svl/solar.hrc | 4
include/svl/svl.hrc | 4
include/svtools/controldims.hrc | 6
include/svtools/helpid.hrc | 4
include/svtools/imagemgr.hrc | 4
include/svtools/svtools.hrc | 6
include/svx/dialogs.hrc | 4
include/svx/exthelpid.hrc | 4
include/svx/fmresids.hrc | 4
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 6
include/svx/svxids.hrc | 6
include/svx/svxitems.hrc | 4
include/svx/unobrushitemhelper.hxx | 6
include/tools/solar.h | 4
include/vcl/fpicker.hrc | 4
include/xmloff/xmlnmspe.hxx | 6
reportdesign/inc/RptResId.hrc | 6
reportdesign/inc/rptui_slotid.hrc | 6
reportdesign/source/inc/stringconstants.hrc | 7
sc/inc/math.hxx | 4
sc/source/ui/inc/checklistmenu.hrc | 4
sc/source/ui/inc/condformatuno.hxx | 4
scaddins/source/datefunc/datefunc.hrc | 4
scaddins/source/pricing/pricing.hrc | 4
sd/inc/app.hrc | 4
sd/inc/glob.hrc | 7
sd/inc/sdattr.hrc | 6
sd/source/ui/accessibility/accessibility.hrc | 7
sd/source/ui/animations/CustomAnimation.hrc | 6
sd/source/ui/annotations/annotations.hrc | 6
sdext/source/minimizer/optimizerdialog.hrc | 4
sfx2/inc/filedlghelper.hrc | 4
sfx2/source/appl/app.hrc | 4
sfx2/source/appl/newhelp.hrc | 6
sfx2/source/appl/shutdownicon.hxx | 4
sfx2/source/dialog/dialog.hrc | 6
sfx2/source/dialog/dinfdlg.hrc | 4
sfx2/source/doc/doc.hrc | 4
sfx2/source/inc/helpid.hrc | 6
sfx2/source/inc/sfxlocal.hrc | 4
sfx2/source/view/view.hrc | 4
starmath/inc/starmath.hrc | 4
svtools/source/brwbox/editbrowsebox.hrc | 6
svtools/source/contnr/templwin.hrc | 6
svtools/source/dialogs/addresstemplate.hrc | 6
svx/inc/AccessibleSvxFindReplaceDialog.hxx | 6
svx/inc/accessibility.hrc | 4
svx/inc/fmhelp.hrc | 4
svx/inc/gallery.hrc | 6
svx/inc/galtheme.hrc | 4
svx/inc/helpid.hrc | 4
svx/source/dialog/docrecovery.hrc | 4
svx/source/inc/datanavi.hrc | 7
svx/source/inc/fmprop.hrc | 6
sw/inc/access.hrc | 4
sw/inc/chrdlg.hrc | 4
sw/inc/comcore.hrc | 4
sw/inc/dbui.hrc | 4
sw/inc/dialog.hrc | 4
sw/inc/dochdl.hrc | 4
sw/inc/envelp.hrc | 4
sw/inc/fldui.hrc | 4
sw/inc/globals.hrc | 6
sw/inc/index.hrc | 6
sw/inc/poolfmt.hrc | 4
sw/inc/rcid.hrc | 4
sw/inc/statstr.hrc | 4
sw/inc/unocore.hrc | 4
sw/source/core/inc/pagefrm.hrc | 4
sw/source/ui/config/config.hrc | 4
sw/source/ui/envelp/envprt.hrc | 4
sw/source/ui/envelp/labfmt.hrc | 4
sw/source/uibase/dialog/regionsw.hrc | 4
sw/source/uibase/docvw/annotation.hrc | 4
sw/source/uibase/docvw/docvw.hrc | 4
sw/source/uibase/envelp/label.hrc | 4
sw/source/uibase/inc/app.hrc | 4
sw/source/uibase/inc/frmui.hrc | 4
sw/source/uibase/inc/globdoc.hrc | 4
sw/source/uibase/inc/misc.hrc | 6
sw/source/uibase/inc/popup.hrc | 6
sw/source/uibase/inc/ribbar.hrc | 4
sw/source/uibase/inc/shells.hrc | 4
sw/source/uibase/inc/utlui.hrc | 4
sw/source/uibase/inc/web.hrc | 4
sw/source/uibase/lingu/olmenu.hrc | 4
sw/source/uibase/ribbar/inputwin.hrc | 4
sw/source/uibase/ribbar/workctrl.hrc | 4
sw/source/uibase/sidebar/PropertyPanel.hrc | 4
sw/source/uibase/uiview/view.hrc | 4
sw/source/uibase/utlui/attrdesc.hrc | 4
sw/source/uibase/utlui/initui.hrc | 4
sw/source/uibase/utlui/unotools.hrc | 4
sw/source/uibase/wrtsh/wrtsh.hrc | 4
writerperfect/source/calc/MSWorksCalcImportFilter.hxx | 4
writerperfect/source/calc/MWAWCalcImportFilter.hxx | 4
writerperfect/source/draw/CDRImportFilter.hxx | 4
writerperfect/source/draw/CMXImportFilter.hxx | 4
writerperfect/source/draw/FreehandImportFilter.hxx | 4
writerperfect/source/draw/MSPUBImportFilter.hxx | 4
writerperfect/source/draw/MWAWDrawImportFilter.hxx | 4
writerperfect/source/draw/PageMakerImportFilter.hxx | 4
writerperfect/source/draw/VisioImportFilter.hxx | 4
writerperfect/source/draw/WPGImportFilter.hxx | 4
writerperfect/source/impress/MWAWPresentationImportFilter.hxx | 4
writerperfect/source/writer/AbiWordImportFilter.hxx | 4
writerperfect/source/writer/MSWorksImportFilter.hxx | 4
writerperfect/source/writer/MWAWImportFilter.hxx | 4
writerperfect/source/writer/WordPerfectImportFilter.hxx | 4
xmloff/inc/xmlsdtypes.hxx | 4
xmloff/source/chart/PropertyMap.hxx | 4
xmloff/source/chart/PropertyMaps.cxx | 2
xmloff/source/draw/sdpropls.cxx | 28
xmloff/source/forms/elementimport.hxx | 81 ++
xmloff/source/forms/elementimport_impl.hxx | 109 ---
xmloff/source/table/XMLTableExport.cxx | 6
xmloff/source/text/txtprmap.cxx | 32
xmlsecurity/inc/xmlsecurity/global.hrc | 4
xmlsecurity/source/dialogs/dialogs.hrc | 4
xmlsecurity/source/dialogs/helpids.hrc | 6
176 files changed, 719 insertions(+), 752 deletions(-)
New commits:
commit b84279a085c117f937e00d25cd476659e3b6f765
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 20:03:03 2016 +0200
Avoid reserved identifiers
Change-Id: I487dea681421cdc72e9491ec19247c8e6437b16b
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 8736dc6..447662a 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -33,42 +33,42 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-#define _M_E( a, p, l, t, c ) \
+#define M_E_( a, p, l, t, c ) \
{ a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, SvtSaveOptions::ODFVER_010, false }
-#define _M_EV( a, p, l, t, c, v ) \
+#define M_EV_( a, p, l, t, c, v ) \
{ a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, v, false }
-#define _M_ED( a, p, l, t, c ) \
+#define M_ED_( a, p, l, t, c ) \
{ a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, (t) | MID_FLAG_DEFAULT_ITEM_EXPORT, c, SvtSaveOptions::ODFVER_010, false }
// text properties
#define MT_E( a, p, l, t, c ) \
- _M_E( a, p, l, (t|XML_TYPE_PROP_TEXT), c )
+ M_E_( a, p, l, (t|XML_TYPE_PROP_TEXT), c )
#define MT_ED( a, p, l, t, c ) \
- _M_ED( a, p, l, (t|XML_TYPE_PROP_TEXT), c )
+ M_ED_( a, p, l, (t|XML_TYPE_PROP_TEXT), c )
// paragraph properties
#define MP_E( a, p, l, t, c ) \
- _M_E( a, p, l, (t|XML_TYPE_PROP_PARAGRAPH), c )
+ M_E_( a, p, l, (t|XML_TYPE_PROP_PARAGRAPH), c )
#define MP_ED( a, p, l, t, c ) \
- _M_ED( a, p, l, (t|XML_TYPE_PROP_PARAGRAPH), c )
+ M_ED_( a, p, l, (t|XML_TYPE_PROP_PARAGRAPH), c )
// graphic properties
#define MG_E( a, p, l, t, c ) \
- _M_E( a, p, l, (t|XML_TYPE_PROP_GRAPHIC), c )
+ M_E_( a, p, l, (t|XML_TYPE_PROP_GRAPHIC), c )
#define MG_ED( a, p, l, t, c ) \
- _M_ED( a, p, l, (t|XML_TYPE_PROP_GRAPHIC), c )
+ M_ED_( a, p, l, (t|XML_TYPE_PROP_GRAPHIC), c )
#define MG_EV( a, p, l, t, c, v ) \
- _M_EV( a, p, l, (t|XML_TYPE_PROP_GRAPHIC), c, v )
+ M_EV_( a, p, l, (t|XML_TYPE_PROP_GRAPHIC), c, v )
// section properties
#define MS_E( a, p, l, t, c ) \
- _M_E( a, p, l, (t|XML_TYPE_PROP_SECTION), c )
+ M_E_( a, p, l, (t|XML_TYPE_PROP_SECTION), c )
// ruby properties
#define MR_E( a, p, l, t, c ) \
- _M_E( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
+ M_E_( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
// extensions import/export
#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
@@ -79,8 +79,8 @@ using namespace ::xmloff::token;
{ nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
//UUUU
-#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
-#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
+#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
+#define GMAP(name,prefix,token,type,context) MAP_(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
XMLPropertyMapEntry aXMLParaPropMap[] =
{
@@ -978,7 +978,7 @@ XMLPropertyMapEntry aXMLTableDefaultsMap[] =
{
// RES_COLLAPSING_BORDERS: only occurs in tables, but we need to
// read/write the default for this item
- _M_ED( "CollapsingBorders", TABLE, BORDER_MODEL, XML_TYPE_PROP_TABLE | XML_TYPE_BORDER_MODEL | MID_FLAG_NO_PROPERTY_IMPORT, CTF_BORDER_MODEL ),
+ M_ED_( "CollapsingBorders", TABLE, BORDER_MODEL, XML_TYPE_PROP_TABLE | XML_TYPE_BORDER_MODEL | MID_FLAG_NO_PROPERTY_IMPORT, CTF_BORDER_MODEL ),
M_END()
};
@@ -987,7 +987,7 @@ XMLPropertyMapEntry aXMLTableRowDefaultsMap[] =
{
// RES_ROW_SPLIT: only occurs in table rows, but we need to
// read/write the default for this item
- _M_ED( "IsSplitAllowed", FO, KEEP_TOGETHER, XML_TYPE_PROP_TABLE_ROW | XML_TYPE_TEXT_NKEEP | MID_FLAG_NO_PROPERTY_IMPORT, CTF_KEEP_TOGETHER ),
+ M_ED_( "IsSplitAllowed", FO, KEEP_TOGETHER, XML_TYPE_PROP_TABLE_ROW | XML_TYPE_TEXT_NKEEP | MID_FLAG_NO_PROPERTY_IMPORT, CTF_KEEP_TOGETHER ),
M_END()
};
commit cb9d95bd422bf6cdce54f92823c7bee583e0d093
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 20:02:53 2016 +0200
Avoid reserved identifiers
Change-Id: Idaa3059658fa0e8942b7b9b7be3198aeda8205e4
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 5f75bd0..d8643b7 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -58,9 +58,9 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::style;
-#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
-#define CMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TABLE_COLUMN,context)
-#define RMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TABLE_ROW,context)
+#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
+#define CMAP(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_TABLE_COLUMN,context)
+#define RMAP(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_TABLE_ROW,context)
#define MAP_END { nullptr, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFVER_010, false }
const XMLPropertyMapEntry* getColumnPropertiesMap()
commit 5771fefc239a5d9cc7345c880a9cbfeddb17e6f5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 20:02:40 2016 +0200
Avoid reserved identifiers
Change-Id: Iadc182d2531f7c01d2dd122559be26588a96bc20
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 51e1494..b64adc3 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -70,14 +70,14 @@ using ::com::sun::star::uno::Any;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
-#define _MAPV(name,prefix,token,type,context,version) { name, sizeof(name)-1, prefix, token, type, context, version, false }
-#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context)
-#define GMAP_D(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC|MID_FLAG_DEFAULT_ITEM_EXPORT,context)
-#define GMAPV(name,prefix,token,type,context,version) _MAPV(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context,version)
-#define DPMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_DRAWING_PAGE,context)
-#define TMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TEXT,context)
-#define PMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
+#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
+#define MAPV_(name,prefix,token,type,context,version) { name, sizeof(name)-1, prefix, token, type, context, version, false }
+#define GMAP(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context)
+#define GMAP_D(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC|MID_FLAG_DEFAULT_ITEM_EXPORT,context)
+#define GMAPV(name,prefix,token,type,context,version) MAPV_(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context,version)
+#define DPMAP(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_DRAWING_PAGE,context)
+#define TMAP(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_TEXT,context)
+#define PMAP(name,prefix,token,type,context) MAP_(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
#define MAP_END() { nullptr, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010, false }
// entry list for graphic properties
@@ -354,12 +354,12 @@ const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[] =
*/
const XMLPropertyMapEntry aXMLTableShapeAttributes[] =
{
- _MAP( "UseFirstRowStyle", XML_NAMESPACE_TABLE, XML_USE_FIRST_ROW_STYLES, XML_TYPE_BOOL, 0 ),
- _MAP( "UseLastRowStyle", XML_NAMESPACE_TABLE, XML_USE_LAST_ROW_STYLES, XML_TYPE_BOOL, 0 ),
- _MAP( "UseFirstColumnStyle", XML_NAMESPACE_TABLE, XML_USE_FIRST_COLUMN_STYLES, XML_TYPE_BOOL, 0 ),
- _MAP( "UseLastColumnStyle", XML_NAMESPACE_TABLE, XML_USE_LAST_COLUMN_STYLES, XML_TYPE_BOOL, 0 ),
- _MAP( "UseBandingRowStyle", XML_NAMESPACE_TABLE, XML_USE_BANDING_ROWS_STYLES, XML_TYPE_BOOL, 0 ),
- _MAP( "UseBandingColumnStyle", XML_NAMESPACE_TABLE, XML_USE_BANDING_COLUMNS_STYLES, XML_TYPE_BOOL, 0 ),
+ MAP_( "UseFirstRowStyle", XML_NAMESPACE_TABLE, XML_USE_FIRST_ROW_STYLES, XML_TYPE_BOOL, 0 ),
+ MAP_( "UseLastRowStyle", XML_NAMESPACE_TABLE, XML_USE_LAST_ROW_STYLES, XML_TYPE_BOOL, 0 ),
+ MAP_( "UseFirstColumnStyle", XML_NAMESPACE_TABLE, XML_USE_FIRST_COLUMN_STYLES, XML_TYPE_BOOL, 0 ),
+ MAP_( "UseLastColumnStyle", XML_NAMESPACE_TABLE, XML_USE_LAST_COLUMN_STYLES, XML_TYPE_BOOL, 0 ),
+ MAP_( "UseBandingRowStyle", XML_NAMESPACE_TABLE, XML_USE_BANDING_ROWS_STYLES, XML_TYPE_BOOL, 0 ),
+ MAP_( "UseBandingColumnStyle", XML_NAMESPACE_TABLE, XML_USE_BANDING_COLUMNS_STYLES, XML_TYPE_BOOL, 0 ),
MAP_END()
};
commit 8d574e2d63277e171a1c4c53570a2b47b133c954
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 20:02:02 2016 +0200
Avoid reserved identifier
Change-Id: Ib4249b97f2c30559f483782ed3ab52e38e6f3080
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index a7f1fba..e9f2634 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PROPERTYMAP_HXX_
-#define _PROPERTYMAP_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_PROPERTYMAP_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_PROPERTYMAP_HXX
#include <xmloff/maptype.hxx>
#include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 0e55b07..72dcf2c 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -19,7 +19,7 @@
// include PropertyMap.hxx with this define
// to create the maps
-#ifndef _PROPERTYMAP_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_PROPERTYMAP_HXX
#define XML_SCH_CREATE_GLOBAL_MAPS
#include "PropertyMap.hxx"
#undef XML_SCH_CREATE_GLOBAL_MAPS
commit dd4f6ce146380d83d210d5c8ce4f7eaa33ed32f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 20:01:33 2016 +0200
Avoid reserved identifier
Change-Id: I578a5ec6a839fddecb372ed78ca7425548e3ae8b
diff --git a/xmloff/inc/xmlsdtypes.hxx b/xmloff/inc/xmlsdtypes.hxx
index fb13d9f..8e388cf 100644
--- a/xmloff/inc/xmlsdtypes.hxx
+++ b/xmloff/inc/xmlsdtypes.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLSDTYPES_HXX
-#define _XMLSDTYPES_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSDTYPES_HXX
+#define INCLUDED_XMLOFF_INC_XMLSDTYPES_HXX
//#include <xmloff/xmlnume.hxx>
//#include <xmloff/maptype.hxx>
commit 0c3b327ed02def4becbb1abbc61d962cfc1ba01e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 20:00:10 2016 +0200
Fold elementimport_impl.hxx into elementimport.hxx
Change-Id: I5e71078ddf98d389b0dd9fcf4252417ddd74ffec
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 86ed4ed..3f6285c 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
+#include <osl/diagnose.h>
class XMLTextStyleContext;
namespace xmloff
@@ -706,9 +707,83 @@ namespace xmloff
,const css::uno::Reference< css::beans::XPropertySet >& _xElement);
};
-#define _INCLUDING_FROM_ELEMENTIMPORT_HXX_
-#include "elementimport_impl.hxx"
-#undef _INCLUDING_FROM_ELEMENTIMPORT_HXX_
+ //= OContainerImport
+ template <class BASE>
+ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext(
+ sal_uInt16 _nPrefix, const OUString& _rLocalName,
+ const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList)
+ {
+ // maybe it's a sub control
+ if (_rLocalName == m_sWrapperElementName)
+ {
+ if (m_xMeAsContainer.is())
+ return implCreateControlWrapper(_nPrefix, _rLocalName);
+ else
+ {
+ OSL_FAIL("OContainerImport::CreateChildContext: don't have an element!");
+ return nullptr;
+ }
+ }
+
+ return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
+ }
+
+ template <class BASE>
+ inline css::uno::Reference< css::beans::XPropertySet >
+ OContainerImport< BASE >::createElement()
+ {
+ // let the base class create the object
+ css::uno::Reference< css::beans::XPropertySet > xReturn = BASE::createElement();
+ if (!xReturn.is())
+ return xReturn;
+
+ // ensure that the object is a XNameContainer (we strongly need this for inserting child elements)
+ m_xMeAsContainer.set(xReturn, css::uno::UNO_QUERY);
+ if (!m_xMeAsContainer.is())
+ {
+ OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!");
+ xReturn.clear();
+ }
+
+ return xReturn;
+ }
+
+ template <class BASE>
+ inline void OContainerImport< BASE >::EndElement()
+ {
+ BASE::EndElement();
+
+ // now that we have all children, attach the events
+ css::uno::Reference< css::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, css::uno::UNO_QUERY);
+ if (xIndexContainer.is())
+ ODefaultEventAttacherManager::setEvents(xIndexContainer);
+ }
+
+ //= OColumnImport
+ template <class BASE>
+ OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
+ const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
+ OControlElement::ElementType _eType)
+ :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType)
+ ,m_xColumnFactory(_rxParentContainer, css::uno::UNO_QUERY)
+ {
+ OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!");
+ }
+
+ // OElementImport overridables
+ template <class BASE>
+ css::uno::Reference< css::beans::XPropertySet > OColumnImport< BASE >::createElement()
+ {
+ css::uno::Reference< css::beans::XPropertySet > xReturn;
+ // no call to the base class' method. We have to use the grid column factory
+ if (m_xColumnFactory.is())
+ {
+ // create the column
+ xReturn = m_xColumnFactory->createColumn(this->m_sServiceName);
+ OSL_ENSURE(xReturn.is(), "OColumnImport::createElement: the factory returned an invalid object!");
+ }
+ return xReturn;
+ }
} // namespace xmloff
diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx
deleted file mode 100644
index bd10064..0000000
--- a/xmloff/source/forms/elementimport_impl.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// no include protection. This file is included from elementimport.hxx only.
-
-#ifndef _INCLUDING_FROM_ELEMENTIMPORT_HXX_
-#error "do not include this file directly!"
-#endif
-
-#include <osl/diagnose.h>
-
-// no namespace. Same as above: this file is included from elementimport.hxx only,
-// and this is done inside the namespace
-
-//= OContainerImport
-template <class BASE>
-inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext(
- sal_uInt16 _nPrefix, const OUString& _rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList)
-{
- // maybe it's a sub control
- if (_rLocalName == m_sWrapperElementName)
- {
- if (m_xMeAsContainer.is())
- return implCreateControlWrapper(_nPrefix, _rLocalName);
- else
- {
- OSL_FAIL("OContainerImport::CreateChildContext: don't have an element!");
- return nullptr;
- }
- }
-
- return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
-}
-
-template <class BASE>
-inline css::uno::Reference< css::beans::XPropertySet >
- OContainerImport< BASE >::createElement()
-{
- // let the base class create the object
- css::uno::Reference< css::beans::XPropertySet > xReturn = BASE::createElement();
- if (!xReturn.is())
- return xReturn;
-
- // ensure that the object is a XNameContainer (we strongly need this for inserting child elements)
- m_xMeAsContainer.set(xReturn, css::uno::UNO_QUERY);
- if (!m_xMeAsContainer.is())
- {
- OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!");
- xReturn.clear();
- }
-
- return xReturn;
-}
-
-template <class BASE>
-inline void OContainerImport< BASE >::EndElement()
-{
- BASE::EndElement();
-
- // now that we have all children, attach the events
- css::uno::Reference< css::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, css::uno::UNO_QUERY);
- if (xIndexContainer.is())
- ODefaultEventAttacherManager::setEvents(xIndexContainer);
-}
-
-//= OColumnImport
-template <class BASE>
-OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
- const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
- OControlElement::ElementType _eType)
- :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType)
- ,m_xColumnFactory(_rxParentContainer, css::uno::UNO_QUERY)
-{
- OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!");
-}
-
-// OElementImport overridables
-template <class BASE>
-css::uno::Reference< css::beans::XPropertySet > OColumnImport< BASE >::createElement()
-{
- css::uno::Reference< css::beans::XPropertySet > xReturn;
- // no call to the base class' method. We have to use the grid column factory
- if (m_xColumnFactory.is())
- {
- // create the column
- xReturn = m_xColumnFactory->createColumn(this->m_sServiceName);
- OSL_ENSURE(xReturn.is(), "OColumnImport::createElement: the factory returned an invalid object!");
- }
- return xReturn;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 20ff812d1c9ceae66a48d21190cc6c4cfe9abcbe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:59:09 2016 +0200
Avoid reserved identifier
Change-Id: Id2c34c5515ca72bba98ff618171b94a6d2da3620
diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index 890141d..ae588d2 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -28,11 +28,11 @@ const sal_uInt16 XML_NAMESPACE_##prefix##_IDX = key;
#define XML_OLD_NAMESPACE( prefix, index ) \
const sal_uInt16 XML_OLD_NAMESPACE_##prefix##_IDX = \
- (_XML_OLD_NAMESPACE_BASE+index);
+ (XML_OLD_NAMESPACE_BASE+index);
// current namespaces
// These namespaces have the same index in the namespace table as prefix used.
-// If a namespace is added, _XML_OLD_NAMESPACE_BASE has to be adjusted!
+// If a namespace is added, XML_OLD_NAMESPACE_BASE has to be adjusted!
XML_NAMESPACE( OFFICE, 0U )
XML_NAMESPACE( STYLE, 1U )
XML_NAMESPACE( TEXT , 2U )
@@ -84,7 +84,7 @@ XML_NAMESPACE_EXT( DRAW, 40U )
XML_NAMESPACE_EXT( CALC, 41U )
XML_NAMESPACE_EXT( LO, 42U )
-#define _XML_OLD_NAMESPACE_BASE 43U
+#define XML_OLD_NAMESPACE_BASE 43U
// namespaces used in the technical preview (SO 5.2)
XML_OLD_NAMESPACE( FO, 0U )
commit 556d9a6b3c73b775d2cf9bb885164d37bbbaa724
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:57:46 2016 +0200
Avoid reserved identifier
Change-Id: I9d36c79e73d061689b6f9b9ddc5f5a99f8a2d2ab
diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx
index ddc911d..732a50c 100644
--- a/include/oox/ole/vbaexport.hxx
+++ b/include/oox/ole/vbaexport.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __INCLUDED_INCLUDE_OOX_OLE_VBAEXPORT_HXX__
-#define __INCLUDED_INCLUDE_OOX_OLE_VBAEXPORT_HXX__
+#ifndef INCLUDED_OOX_OLE_VBAEXPORT_HXX
+#define INCLUDED_OOX_OLE_VBAEXPORT_HXX
#include <com/sun/star/uno/XInterface.hpp>
commit 16524faa47befbc7fa74636f99097b5654ad5818
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:57:26 2016 +0200
Avoid reserved identifiers
Change-Id: Ieb94e82b102673fd3c916d09d8390e6528b37c11
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index bda405c..177cbc7 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -444,10 +444,10 @@ typedef unsigned short LanguageType;
#define LANGUAGE_qps_ploca 0x05FE /* 'qps-ploca', qps is a reserved for local use code */
#define LANGUAGE_qps_plocm 0x09FF /* 'qps-plocm', qps is a reserved for local use code */
-#define LANGUAGE_ar_Ploc_SA__reserved 0x4401 /* 'ar-Ploc-SA', 'Ploc'?? */
-#define LANGUAGE_ja_Ploc_JP__reserved 0x0811 /* 'ja-Ploc-JP', 'Ploc'?? */
-#define LANGUAGE_pap_029__reserved 0x0479 /* 'pap-029' */
-#define LANGUAGE_ar_145__reserved 0x4801 /* 'ar-145' */
+#define LANGUAGE_ar_Ploc_SA_reserved 0x4401 /* 'ar-Ploc-SA', 'Ploc'?? */
+#define LANGUAGE_ja_Ploc_JP_reserved 0x0811 /* 'ja-Ploc-JP', 'Ploc'?? */
+#define LANGUAGE_pap_029_reserved 0x0479 /* 'pap-029' */
+#define LANGUAGE_ar_145_reserved 0x4801 /* 'ar-145' */
#define LANGUAGE_es_419 0x580A /* 'es-419', not reserved, used? */
/* Seems these values were used or reserved at one point of time ... */
commit e07ca6480d723309bd7a9ea638fd7381d294db21
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:55:49 2016 +0200
Avoid reserved identifier
Change-Id: I2e632b1e3f6f8725b184918c2205c3772bb37e32
diff --git a/external/jpeg/patches/jpeg-8c-jmorecfg.patch b/external/jpeg/patches/jpeg-8c-jmorecfg.patch
index eed791f..89a92c6 100644
--- a/external/jpeg/patches/jpeg-8c-jmorecfg.patch
+++ b/external/jpeg/patches/jpeg-8c-jmorecfg.patch
@@ -4,7 +4,7 @@
/* INT32 must hold at least signed 32-bit values. */
#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
-+#ifndef _SOLAR_H
++#ifndef INCLUDED_TOOLS_SOLAR_H
#ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
#ifndef _BASETSD_H /* MinGW is slightly different */
#ifndef QGLOBAL_H /* Qt defines it in qglobal.h */
diff --git a/include/tools/solar.h b/include/tools/solar.h
index e503f38..2c4793b 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SOLAR_H
-#define _SOLAR_H
+#ifndef INCLUDED_TOOLS_SOLAR_H
+#define INCLUDED_TOOLS_SOLAR_H
#include <sal/types.h>
#include <osl/endian.h>
commit dcc22d9860f013b3986bcca71f7d102c72ab353d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:54:20 2016 +0200
Avoid reserved identifier
Change-Id: Ie881d77774ea05b5683850c113cf3f6b1d6f2ca7
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 34bfe20..b472e77 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AVMEDIA_HELPIDS_HRC
-#define _AVMEDIA_HELPIDS_HRC
+#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_HRC
+#define INCLUDED_AVMEDIA_INC_HELPIDS_HRC
#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
@@ -33,6 +33,6 @@
#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
-#endif // _AVMEDIA_HELPIDS_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ec1ddec33c98bcd3e8975031cf611f3fe7ddff63
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:54:08 2016 +0200
Avoid reserved identifier
Change-Id: I5c166398df5a16c5c9123ce3c046cbf6d64b9fa4
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 5935bb3..86e3d4f 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BASCTL_HELPID_HRC
-#define _BASCTL_HELPID_HRC
+#ifndef INCLUDED_BASCTL_INC_HELPID_HRC
+#define INCLUDED_BASCTL_INC_HELPID_HRC
#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT"
commit ea7b57272cea8d74d0d47ee3dddd019f256f80f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:54:00 2016 +0200
Avoid reserved identifier
Change-Id: Ic59b23de2c11e8a0a86c3711a4507cd76e07896f
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index be8d945..d4191be 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SB_HRC
-#define _SB_HRC
+#ifndef INCLUDED_BASIC_INC_SB_HRC
+#define INCLUDED_BASIC_INC_SB_HRC
#include <svl/solar.hrc>
commit 7816dd1bbbc35c48f5a60657ed73c5b43377f2ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:53:46 2016 +0200
Avoid reserved identifier
Change-Id: I8590b2c145a536872d692afcaa50279c99b3f974
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index 16cda85..829b64c 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CHART2_RESOURCE_IDS_HRC
-#define _CHART2_RESOURCE_IDS_HRC
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC
//for strings see Strings.hrc
//for Bitmaps see Bitmaps.hrc
commit e6e59b52d18f9678b6a40263fcf85ca6bbde7a20
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:53:33 2016 +0200
Avoid reserved identifiers
Change-Id: I7d5eec4c8bcfc79edb3c0ea37cf73b4249f44f46
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index f17cd76..0b4f77a 100644
--- a/cui/source/dialogs/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FMSEARCH_HRC
-#define _FMSEARCH_HRC
+#ifndef INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
+#define INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
#include "svl/solar.hrc"
@@ -33,6 +33,6 @@
#define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35)
#define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76)
-#endif // _FMSEARCH_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index e46e4a1..ac4b7e6 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CUI_RESID_HRC
-#define _CUI_RESID_HRC
+#ifndef INCLUDED_CUI_SOURCE_INC_CUIRES_HRC
+#define INCLUDED_CUI_SOURCE_INC_CUIRES_HRC
#include <sfx2/sfx.hrc>
#include <sfx2/dialogs.hrc>
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index ab1fdc3..6eb74f9 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CUI_HELPID_HRC
-#define _CUI_HELPID_HRC
+#ifndef INCLUDED_CUI_SOURCE_INC_HELPID_HRC
+#define INCLUDED_CUI_SOURCE_INC_HELPID_HRC
#include <svx/svxcommands.h>
#include <sfx2/sfxcommands.h>
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index 83340af..485d35e 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVX_OPTSAVE_HRC
-#define _SVX_OPTSAVE_HRC
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
// defines ------------------------------------------------------------------
@@ -30,6 +30,6 @@
#define APP_MATH 6
#define APP_COUNT 7
-#endif // #ifndef _SVX_OPTSAVE_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc
index b9e3ccd..44e3657 100644
--- a/cui/source/tabpages/align.hrc
+++ b/cui/source/tabpages/align.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVX_ALIGN_HRC
-#define _SVX_ALIGN_HRC
+#ifndef INCLUDED_CUI_SOURCE_TABPAGES_ALIGN_HRC
+#define INCLUDED_CUI_SOURCE_TABPAGES_ALIGN_HRC
// image list for ValueSets:
#define IL_LOCK_BMPS 1100
diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc
index 06551ef..4909cf4 100644
--- a/cui/source/tabpages/border.hrc
+++ b/cui/source/tabpages/border.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVX_BORDER_HRC
-#define _SVX_BORDER_HRC
+#ifndef INCLUDED_CUI_SOURCE_TABPAGES_BORDER_HRC
+#define INCLUDED_CUI_SOURCE_TABPAGES_BORDER_HRC
// ImageList for ValueSets:
#define IL_PRE_BITMAPS 1400
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 0803bba..31694ed 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVX_PARAGRPH_HRC
-#define _SVX_PARAGRPH_HRC
+#ifndef INCLUDED_CUI_SOURCE_TABPAGES_PARAGRPH_HRC
+#define INCLUDED_CUI_SOURCE_TABPAGES_PARAGRPH_HRC
// StandardTabPage ----------------------------------------------------------
commit 9576cf9c3f011abec32b52e6d9342e4567abd9ac
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:53:13 2016 +0200
Avoid reserved identifiers
Change-Id: I15609fb6b11606d865d8817f4a63ba8816f7384e
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index e62c1d7..d005d98 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
-#define _DBA_DBACCESS_HELPID_HRC_
+#ifndef INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC
+#define INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC
#define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER"
@@ -168,6 +168,6 @@
-#endif // _DBA_DBACCESS_HELPID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc
index 9d4bc33..4b37b4d 100644
--- a/dbaccess/inc/dbaccess_slotid.hrc
+++ b/dbaccess/inc/dbaccess_slotid.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBACCESS_SLOTID_HRC_
-#define _DBACCESS_SLOTID_HRC_
+#ifndef INCLUDED_DBACCESS_INC_DBACCESS_SLOTID_HRC
+#define INCLUDED_DBACCESS_INC_DBACCESS_SLOTID_HRC
#include <sfx2/sfxsids.hrc>
@@ -105,6 +105,6 @@
#define SID_QUERY_PROP_DLG ( SID_DBACCESS_START + 69 )
-#endif // _DBACCESS_SLOTID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index 4ab8b27..3789747 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_CORE_RESOURCE_HRC_
-#define _DBA_CORE_RESOURCE_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
#include <svl/solar.hrc>
@@ -96,6 +96,6 @@
#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 )
-#endif // _DBA_CORE_RESOURCE_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc
index 3aaa9f0..5d9b36f 100644
--- a/dbaccess/source/core/inc/dbamiscres.hrc
+++ b/dbaccess/source/core/inc/dbamiscres.hrc
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_MISCRES_HRC_
-#define _DBA_MISCRES_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC
#define STR_MYSQL_NATIVE 24
#define STR_END STR_MYSQL_NATIVE + 1
-#endif // _DBA_MISCRES_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc
index 1fd5f26..d05fbf7 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBASHARED_STRINGCONSTANTS_HRC_
-#define _DBASHARED_STRINGCONSTANTS_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC
+#define INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC
#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT
#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
@@ -172,6 +172,6 @@
#define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER 145
#define PROPERTY_ID_PROPCHANGE_NOTIFY 146
-#endif // _DBASHARED_STRINGCONSTANTS_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc
index f47ddbc..a5cfcd0 100644
--- a/dbaccess/source/ui/app/dbu_app.hrc
+++ b/dbaccess/source/ui/app/dbu_app.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_APP_HRC_
-#define _DBU_APP_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC
#include "dbu_resource.hrc"
@@ -61,6 +61,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif // _DBU_APP_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc
index 6e9f7a2..324ba23 100644
--- a/dbaccess/source/ui/inc/dbu_brw.hrc
+++ b/dbaccess/source/ui/inc/dbu_brw.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_BRW_HRC_
-#define _DBU_BRW_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC
#include "dbu_resource.hrc"
@@ -42,6 +42,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif // _DBU_BRW_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc
index 12d5b32..4680505 100644
--- a/dbaccess/source/ui/inc/dbu_control.hrc
+++ b/dbaccess/source/ui/inc/dbu_control.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_CONTROL_HRC_
-#define _DBU_CONTROL_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC
#include "dbu_resource.hrc"
@@ -42,6 +42,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif //_DBU_CONTROL_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 1089be5..3fb2053 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_DLG_HRC_
-#define _DBU_DLG_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
#include "dbu_resource.hrc"
@@ -150,6 +150,6 @@
#error Resource-Id Overflow in #file, #line
#endif
-#endif //_DBU_DLG_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
index 48b1ee5..da47b36 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_MISC_HRC_
-#define _DBU_MISC_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC
#include "dbu_resource.hrc"
@@ -50,6 +50,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif // _DBU_MISC_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc
index 19f1ad3..a628692 100644
--- a/dbaccess/source/ui/inc/dbu_qry.hrc
+++ b/dbaccess/source/ui/inc/dbu_qry.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_QRY_HRC_
-#define _DBU_QRY_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC
#include "dbu_resource.hrc"
@@ -78,6 +78,6 @@
#error resource id overflow in #file, #line
#endif
-#endif // _DBU_QRY_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc
index 8be4567..85e2bad 100644
--- a/dbaccess/source/ui/inc/dbu_rel.hrc
+++ b/dbaccess/source/ui/inc/dbu_rel.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_REL_HRC_
-#define _DBU_REL_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC
#include "dbu_resource.hrc"
@@ -34,6 +34,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif //_DBU_REL_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 5b11a6d..50d5789 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_RESOURCE_HRC_
-#define _DBU_RESOURCE_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
#include <svl/solar.hrc>
@@ -220,6 +220,6 @@
#define PB_FORMAT RID_MISC_START + 0
-#endif // _DBU_RESOURCE_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc
index 7fe2430..d47a760 100644
--- a/dbaccess/source/ui/inc/dbu_tbl.hrc
+++ b/dbaccess/source/ui/inc/dbu_tbl.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_TBL_HRC_
-#define _DBU_TBL_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC
#include "dbu_resource.hrc"
@@ -84,6 +84,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif // _DBU_TBL_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc
index c49ab2f..a968abe 100644
--- a/dbaccess/source/ui/inc/dbu_uno.hrc
+++ b/dbaccess/source/ui/inc/dbu_uno.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_UNO_HRC_
-#define _DBU_UNO_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC
#include "dbu_resource.hrc"
@@ -41,6 +41,6 @@
#error too many resources in uno ....
#endif
-#endif // _DBU_UNO_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 99520681fcb780a5e0ef21e0e56ab94821647eeb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:52:58 2016 +0200
Avoid reserved identifier
Change-Id: I2c9d6a750f3a7d1ce29f3e9fe315defc63c46e46
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 173685d..ac138ec 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DESKTOP_HRC_
-#define _DESKTOP_HRC_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC
+#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC
#include <svl/solar.hrc>
@@ -65,7 +65,6 @@
#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
#define RID_APPTITLE (RID_DESKTOP_STRING_START+208)
-
-#endif // _DESKTOP_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1e418f852770b69965b6cababa5a1d1844544a19
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:52:43 2016 +0200
Avoid reserved identifiers
Change-Id: I10be69e36c79c15d2e02457558e37ec3efbf80c1
diff --git a/extensions/source/bibliography/bibprop.hrc b/extensions/source/bibliography/bibprop.hrc
index 11b03f2..46d6d40 100644
--- a/extensions/source/bibliography/bibprop.hrc
+++ b/extensions/source/bibliography/bibprop.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BIB_FMPROP_HRC
-#define _BIB_FMPROP_HRC
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HRC
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HRC
extern rtl::OUString FM_PROP_LABEL;
extern rtl::OUString FM_PROP_NAME;
@@ -30,6 +30,6 @@ extern rtl::OUString FM_PROP_CURSORSOURCE;
extern rtl::OUString FM_PROP_CURSORSOURCETYPE;
extern rtl::OUString FM_PROP_TEXT;
-#endif // _SVX_FMPROP_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 1b3d460..02581b8 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_
-#define _EXTENSIONS_DBP_DBPRESID_HRC_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPRESID_HRC
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPRESID_HRC
#include "dbpilots.hrc"
#include "extensio.hrc"
@@ -88,6 +88,6 @@
#define WINDOW_SIZE_Y 185
#define WINDOW_HALF_SIZE_X ( WINDOW_SIZE_X / 2 )
-#endif // _EXTENSIONS_DBP_DBPRESID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc
index 603faa7..59ca407 100644
--- a/extensions/source/propctrlr/formlocalid.hrc
+++ b/extensions/source/propctrlr/formlocalid.hrc
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
-#define _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLOCALID_HRC
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLOCALID_HRC
#define IMG_PLUS 1
#define IMG_MINUS 2
-#endif // _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index 48625eb..3bf7a80 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_
-#define _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMRESID_HRC
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMRESID_HRC
#include "propresid.hrc"
@@ -349,6 +349,6 @@
#define RID_SVXIMG_SPINBUTTON 10769
#define RID_SVXIMG_NAVIGATIONBAR 10607
-#endif // _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 173525bb44bffb8958ede6b10bd5ac429c97ca3e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:52:13 2016 +0200
Avoid reserved identifiers
Change-Id: Icaf083db79b2ceb88e9b0e9e4e2a131cf6ba498b
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 8061a58..cfb1f29 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -116,7 +116,7 @@ namespace T602ImportFilter {
"\x04\x4d\x02\xdd\x04\x4e\x02\xc7\x04\x4f\x00\xa7\x04\x34\x00\xe0" // F
"\x00\xb4\x00\xb0\x00\xc0\x02\xc6\x01\x58\x01\x59\x00\x20\x00\x20";
-#define _Start(_nam) \
+#define Start_(_nam) \
if (mxHandler.is()) \
{ \
mxHandler->startElement(_nam, mAttrList); \
@@ -124,7 +124,7 @@ namespace T602ImportFilter {
mpAttrList->Clear(); \
}
-#define _End(_nam) \
+#define End_(_nam) \
if (mxHandler.is()) \
{ \
mxHandler->endElement(_nam); \
@@ -238,8 +238,8 @@ void T602ImportFilter::inschr(unsigned char ch)
sprintf(s,"%i",pst.wasspace);
if (mpAttrList)
mpAttrList->AddAttribute("text:c",OUString::createFromAscii(s));
- _Start("text:s");
- _End("text:s");
+ Start_("text:s");
+ End_("text:s");
}
}
@@ -302,156 +302,156 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property
mpAttrList->AddAttribute("xmlns:script", "http://openoffice.org/2000/script");
mpAttrList->AddAttribute("office:class", "text");
mpAttrList->AddAttribute("office:version", "1.0");
- _Start("office:document-content");
+ Start_("office:document-content");
- _Start("office:font-decls");
+ Start_("office:font-decls");
mpAttrList->AddAttribute("style:name","Courier New");
mpAttrList->AddAttribute("fo:font-family","Courier New");
mpAttrList->AddAttribute("style:font-pitch","fixed");
- _Start("style:font-decl");
- _End("style:font-decl");
- _End("office:font-decls");
+ Start_("style:font-decl");
+ End_("style:font-decl");
+ End_("office:font-decls");
- _Start("office:automatic-styles");
+ Start_("office:automatic-styles");
// Standardni text
mpAttrList->AddAttribute("style:name","P1");
mpAttrList->AddAttribute("style:family","paragraph");
mpAttrList->AddAttribute("style:parent-style-name","Standard");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("style:font-name","Courier New");
mpAttrList->AddAttribute("fo:font-size",OUString::createFromAscii(fs));
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// Standardni text - konec stranky
mpAttrList->AddAttribute("style:name","P2");
mpAttrList->AddAttribute("style:family","paragraph");
mpAttrList->AddAttribute("style:parent-style-name","Standard");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("style:font-name","Courier New");
mpAttrList->AddAttribute("fo:font-size",OUString::createFromAscii(fs));
mpAttrList->AddAttribute("fo:break-before","page");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T1 Normalni text
mpAttrList->AddAttribute("style:name","T1");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T2 Tucny text
mpAttrList->AddAttribute("style:name","T2");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-weight","bold");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T3 Kurziva
mpAttrList->AddAttribute("style:name","T3");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-style","italic");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T4 Siroky text
mpAttrList->AddAttribute("style:name","T4");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-weight","bold");
mpAttrList->AddAttribute("style:text-scale","200%");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T5 Vysoky text
mpAttrList->AddAttribute("style:name","T5");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-size",OUString::createFromAscii(fs2));
mpAttrList->AddAttribute("fo:font-weight","bold");
mpAttrList->AddAttribute("style:text-scale","50%");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T6 Velky text
mpAttrList->AddAttribute("style:name","T6");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-size",OUString::createFromAscii(fs2));
mpAttrList->AddAttribute("fo:font-weight","bold");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T7 Podtrzeny text
mpAttrList->AddAttribute("style:name","T7");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("style:text-underline","single");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T8 Podtrzena tucny text
mpAttrList->AddAttribute("style:name","T8");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-weight","bold");
mpAttrList->AddAttribute("style:text-underline","single");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T9 Podtrzena kurziva
mpAttrList->AddAttribute("style:name","T9");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("fo:font-style","italic");
mpAttrList->AddAttribute("style:text-underline","single");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T10 Horni index
mpAttrList->AddAttribute("style:name","T10");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("style:text-position","27% 100%");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
// T11 Dolni index
mpAttrList->AddAttribute("style:name","T11");
mpAttrList->AddAttribute("style:family","text");
- _Start("style:style");
+ Start_("style:style");
mpAttrList->AddAttribute("style:text-position","-27% 100%");
- _Start("style:properties");
- _End("style:properties");
- _End("style:style");
+ Start_("style:properties");
+ End_("style:properties");
+ End_("style:style");
- _End("office:automatic-styles");
+ End_("office:automatic-styles");
- _Start("office:styles");
- _End("office:styles");
+ Start_("office:styles");
+ End_("office:styles");
- _Start("office:body");
+ Start_("office:body");
Read602();
- _End("office:body");
- _End("office:document-content");
+ End_("office:body");
+ End_("office:document-content");
mxHandler->endDocument();
@@ -542,11 +542,11 @@ void T602ImportFilter::wrtfnt()
default : style = "T1"; break;
}
- _End("text:span");
+ End_("text:span");
if (mpAttrList)
mpAttrList->AddAttribute(
"text:style-name", OUString::createFromAscii(style));
- _Start("text:span");
+ Start_("text:span");
}
void T602ImportFilter::setfnt(fonts fnt,bool mustwrite)
@@ -580,16 +580,16 @@ void T602ImportFilter::par602(bool endofpage)
if(!endofpage || !pst.waspar) {
if(ini.showcomm||!pst.comment) {
if(pst.waspar||ini.reformatpars) {
- _End("text:span");
- _End("text:p");
+ End_("text:span");
+ End_("text:p");
if (mpAttrList)
mpAttrList->AddAttribute("text:style-name", "P1");
- _Start("text:p");
- _Start("text:span");
+ Start_("text:p");
+ Start_("text:span");
wrtfnt();
} else {
- _Start("text:line-break");
- _End("text:line-break");
+ Start_("text:line-break");
+ End_("text:line-break");
}
}
@@ -607,12 +607,12 @@ void T602ImportFilter::par602(bool endofpage)
if(((pst.pars+1)/2) >= endp || endofpage) {
pst.pars = 0;
if(!ini.reformatpars) {
- _End("text:span");
- _End("text:p");
+ End_("text:span");
+ End_("text:p");
if (mpAttrList)
mpAttrList->AddAttribute("text:style-name", "P2");
- _Start("text:p");
- _Start("text:span");
+ Start_("text:p");
+ Start_("text:span");
wrtfnt();
}
}
@@ -719,10 +719,10 @@ void T602ImportFilter::Read602()
if (mpAttrList)
mpAttrList->AddAttribute("text:style-name", "P1");
- _Start("text:p");
+ Start_("text:p");
if (mpAttrList)
mpAttrList->AddAttribute("text:style-name", "T1");
- _Start("text:span");
+ Start_("text:span");
if (node==START) { node = EOL; }
@@ -790,8 +790,8 @@ void T602ImportFilter::Read602()
case SETCH :
// warning: potentially uninitialized
switch(ch) {
- case '\t' : _Start("text:tab-stop");
- _End("text:tab-stop");
+ case '\t' : Start_("text:tab-stop");
+ End_("text:tab-stop");
break;
case 0x03 : break; //condensed
case 0x01 : break; //elite
@@ -866,8 +866,8 @@ void T602ImportFilter::Read602()
}
}
- _End("text:span");
- _End("text:p");
+ End_("text:span");
+ End_("text:p");
node = QUIT;
}
@@ -938,26 +938,26 @@ Locale SAL_CALL T602ImportFilterDialog::getLocale()
bool T602ImportFilterDialog::OptionsDlg()
{
Any any;
-#define _propInt(_prop,_nam,_val) \
+#define propInt_(_prop,_nam,_val) \
any <<= (sal_Int32)_val;\
_prop->setPropertyValue(_nam, any);
-#define _propShort(_prop,_nam,_val) \
+#define propShort_(_prop,_nam,_val) \
any <<= (sal_Int16)_val;\
_prop->setPropertyValue(_nam, any);
-#define _propBool(_prop,_nam,_val) \
+#define propBool_(_prop,_nam,_val) \
any <<= _val;\
_prop->setPropertyValue(_nam, any);
-#define _propString(_prop,_nam,_val) \
+#define propString_(_prop,_nam,_val) \
any <<= OUString(_val);\
_prop->setPropertyValue(_nam, any);
-#define _propStringFromResId(_prop,_nam,_val) \
+#define propStringFromResId_(_prop,_nam,_val) \
any <<= getResStr(_val);\
_prop->setPropertyValue(_nam, any);
-#define _propGet(_prop,_nam) \
+#define propGet_(_prop,_nam) \
_prop->getPropertyValue(_nam);
-#define _Inst(_path)\
+#define Inst_(_path)\
xMultiServiceFactory->createInstance(_path);
-#define _Insert(_cont,_nam,_obj) \
+#define Insert_(_cont,_nam,_obj) \
any <<= _obj;\
_cont->insertByName( _nam, any );
@@ -968,11 +968,11 @@ bool T602ImportFilterDialog::OptionsDlg()
Reference <XMultiServiceFactory> xMultiServiceFactory (rInstance,UNO_QUERY);
Reference < XPropertySet > xPSetDialog( rInstance, UNO_QUERY );
- _propInt(xPSetDialog,"PositionX",100);
- _propInt(xPSetDialog,"PositionY",100);
- _propInt(xPSetDialog,"Width",130);
- _propInt(xPSetDialog,"Height",90);
- _propStringFromResId(xPSetDialog,"Title", T602FILTER_STR_IMPORT_DIALOG_TITLE);
+ propInt_(xPSetDialog,"PositionX",100);
+ propInt_(xPSetDialog,"PositionY",100);
+ propInt_(xPSetDialog,"Width",130);
+ propInt_(xPSetDialog,"Height",90);
+ propStringFromResId_(xPSetDialog,"Title", T602FILTER_STR_IMPORT_DIALOG_TITLE);
#define T602DLG_OK_BUTTON "ok_button"
#define T602DLG_CANCEL_BUTTON "cancel_button"
@@ -982,25 +982,25 @@ bool T602ImportFilterDialog::OptionsDlg()
#define T602DLG_REFORMAT_CB "reformat_cb"
#define T602DLG_CODE_TXT "code_txt"
- Reference < XInterface > TextModel = _Inst("com.sun.star.awt.UnoControlFixedTextModel");
+ Reference < XInterface > TextModel = Inst_("com.sun.star.awt.UnoControlFixedTextModel");
Reference < XPropertySet > xPSetText( TextModel, UNO_QUERY );
- _propInt(xPSetText,"PositionX",10);
- _propInt(xPSetText,"PositionY",8);
- _propInt(xPSetText,"Width",30);
- _propInt(xPSetText,"Height",14);
- _propString(xPSetText,"Name",T602DLG_CODE_TXT);
- _propStringFromResId(xPSetText,"Label",T602FILTER_STR_ENCODING_LABEL);
-
- Reference < XInterface > ListBoxModel = _Inst("com.sun.star.awt.UnoControlListBoxModel");
+ propInt_(xPSetText,"PositionX",10);
+ propInt_(xPSetText,"PositionY",8);
+ propInt_(xPSetText,"Width",30);
+ propInt_(xPSetText,"Height",14);
+ propString_(xPSetText,"Name",T602DLG_CODE_TXT);
+ propStringFromResId_(xPSetText,"Label",T602FILTER_STR_ENCODING_LABEL);
+
+ Reference < XInterface > ListBoxModel = Inst_("com.sun.star.awt.UnoControlListBoxModel");
Reference < XPropertySet > xPSetCodeLB( ListBoxModel, UNO_QUERY );
- _propInt(xPSetCodeLB,"PositionX",40);
- _propInt(xPSetCodeLB,"PositionY",5);
- _propInt(xPSetCodeLB,"Width",85);
- _propInt(xPSetCodeLB,"Height",14);
- _propString(xPSetCodeLB,"Name",T602DLG_CODE_LB);
- _propShort(xPSetCodeLB,"TabIndex",1);
- _propBool(xPSetCodeLB,"Dropdown",true);
- _propBool(xPSetCodeLB,"MultiSelection",false);
+ propInt_(xPSetCodeLB,"PositionX",40);
+ propInt_(xPSetCodeLB,"PositionY",5);
+ propInt_(xPSetCodeLB,"Width",85);
+ propInt_(xPSetCodeLB,"Height",14);
+ propString_(xPSetCodeLB,"Name",T602DLG_CODE_LB);
+ propShort_(xPSetCodeLB,"TabIndex",1);
+ propBool_(xPSetCodeLB,"Dropdown",true);
+ propBool_(xPSetCodeLB,"MultiSelection",false);
Sequence< OUString > ous(4);
ous[0] = getResStr(T602FILTER_STR_ENCODING_AUTO);
@@ -1015,71 +1015,71 @@ bool T602ImportFilterDialog::OptionsDlg()
any <<= shr;
xPSetCodeLB->setPropertyValue("SelectedItems", any);
- Reference < XInterface > AzbCheckBoxModel = _Inst("com.sun.star.awt.UnoControlCheckBoxModel");
+ Reference < XInterface > AzbCheckBoxModel = Inst_("com.sun.star.awt.UnoControlCheckBoxModel");
Reference < XPropertySet > xPSetAzbukaCB( AzbCheckBoxModel, UNO_QUERY );
- _propInt(xPSetAzbukaCB,"PositionX",10);
- _propInt(xPSetAzbukaCB,"PositionY",25);
- _propInt(xPSetAzbukaCB,"Width",100);
- _propInt(xPSetAzbukaCB,"Height",14);
- _propString(xPSetAzbukaCB,"Name",T602DLG_AZBUKA_CB);
- _propShort(xPSetAzbukaCB,"TabIndex",2);
- _propStringFromResId(xPSetAzbukaCB,"Label",T602FILTER_STR_CYRILLIC_MODE);
- _propShort(xPSetAzbukaCB,"State",ini.ruscode);
-
- Reference < XInterface > RefCheckBoxModel = _Inst("com.sun.star.awt.UnoControlCheckBoxModel");
+ propInt_(xPSetAzbukaCB,"PositionX",10);
+ propInt_(xPSetAzbukaCB,"PositionY",25);
+ propInt_(xPSetAzbukaCB,"Width",100);
+ propInt_(xPSetAzbukaCB,"Height",14);
+ propString_(xPSetAzbukaCB,"Name",T602DLG_AZBUKA_CB);
+ propShort_(xPSetAzbukaCB,"TabIndex",2);
+ propStringFromResId_(xPSetAzbukaCB,"Label",T602FILTER_STR_CYRILLIC_MODE);
+ propShort_(xPSetAzbukaCB,"State",ini.ruscode);
+
+ Reference < XInterface > RefCheckBoxModel = Inst_("com.sun.star.awt.UnoControlCheckBoxModel");
Reference < XPropertySet > xPSetRefCB( RefCheckBoxModel, UNO_QUERY );
- _propInt(xPSetRefCB,"PositionX",10);
- _propInt(xPSetRefCB,"PositionY",40);
- _propInt(xPSetRefCB,"Width",100);
- _propInt(xPSetRefCB,"Height",14);
- _propString(xPSetRefCB,"Name",T602DLG_REFORMAT_CB);
- _propShort(xPSetRefCB,"TabIndex",3);
- _propStringFromResId(xPSetRefCB,"Label",T602FILTER_STR_REFORMAT_TEXT);
- _propShort(xPSetRefCB,"State",ini.reformatpars);
-
- Reference < XInterface > CommCheckBoxModel = _Inst("com.sun.star.awt.UnoControlCheckBoxModel");
+ propInt_(xPSetRefCB,"PositionX",10);
+ propInt_(xPSetRefCB,"PositionY",40);
+ propInt_(xPSetRefCB,"Width",100);
+ propInt_(xPSetRefCB,"Height",14);
+ propString_(xPSetRefCB,"Name",T602DLG_REFORMAT_CB);
+ propShort_(xPSetRefCB,"TabIndex",3);
+ propStringFromResId_(xPSetRefCB,"Label",T602FILTER_STR_REFORMAT_TEXT);
+ propShort_(xPSetRefCB,"State",ini.reformatpars);
+
+ Reference < XInterface > CommCheckBoxModel = Inst_("com.sun.star.awt.UnoControlCheckBoxModel");
Reference < XPropertySet > xPSetCommCB( CommCheckBoxModel, UNO_QUERY );
- _propInt(xPSetCommCB,"PositionX",10);
- _propInt(xPSetCommCB,"PositionY",55);
- _propInt(xPSetCommCB,"Width",100);
- _propInt(xPSetCommCB,"Height",14);
- _propString(xPSetCommCB,"Name",T602DLG_COMMENT_CB);
- _propShort(xPSetCommCB,"TabIndex",4);
- _propStringFromResId(xPSetCommCB,"Label",T602FILTER_STR_DOT_COMMANDS);
- _propShort(xPSetCommCB,"State",ini.showcomm);
-
- Reference < XInterface > CancelButtonModel = _Inst("com.sun.star.awt.UnoControlButtonModel");
+ propInt_(xPSetCommCB,"PositionX",10);
+ propInt_(xPSetCommCB,"PositionY",55);
+ propInt_(xPSetCommCB,"Width",100);
+ propInt_(xPSetCommCB,"Height",14);
+ propString_(xPSetCommCB,"Name",T602DLG_COMMENT_CB);
+ propShort_(xPSetCommCB,"TabIndex",4);
+ propStringFromResId_(xPSetCommCB,"Label",T602FILTER_STR_DOT_COMMANDS);
+ propShort_(xPSetCommCB,"State",ini.showcomm);
+
+ Reference < XInterface > CancelButtonModel = Inst_("com.sun.star.awt.UnoControlButtonModel");
Reference < XPropertySet > xPSetCancelButton( CancelButtonModel, UNO_QUERY );
- _propInt(xPSetCancelButton,"PositionX",10);
- _propInt(xPSetCancelButton,"PositionY",70);
- _propInt(xPSetCancelButton,"Width",50);
- _propInt(xPSetCancelButton,"Height",14);
- _propString(xPSetCancelButton,"Name",T602DLG_CANCEL_BUTTON);
- _propShort(xPSetCancelButton,"TabIndex",5);
- _propShort(xPSetCancelButton,"PushButtonType",2);
- _propStringFromResId(xPSetCancelButton,"Label",T602FILTER_STR_CANCEL_BUTTON);
-
- Reference < XInterface > OkButtonModel = _Inst("com.sun.star.awt.UnoControlButtonModel");
+ propInt_(xPSetCancelButton,"PositionX",10);
+ propInt_(xPSetCancelButton,"PositionY",70);
+ propInt_(xPSetCancelButton,"Width",50);
+ propInt_(xPSetCancelButton,"Height",14);
+ propString_(xPSetCancelButton,"Name",T602DLG_CANCEL_BUTTON);
+ propShort_(xPSetCancelButton,"TabIndex",5);
+ propShort_(xPSetCancelButton,"PushButtonType",2);
+ propStringFromResId_(xPSetCancelButton,"Label",T602FILTER_STR_CANCEL_BUTTON);
+
+ Reference < XInterface > OkButtonModel = Inst_("com.sun.star.awt.UnoControlButtonModel");
Reference < XPropertySet > xPSetOkButton( OkButtonModel, UNO_QUERY );
- _propInt(xPSetOkButton,"PositionX",70);
- _propInt(xPSetOkButton,"PositionY",70);
- _propInt(xPSetOkButton,"Width",50);
- _propInt(xPSetOkButton,"Height",14);
- _propString(xPSetOkButton,"Name",T602DLG_OK_BUTTON);
- _propShort(xPSetOkButton,"TabIndex",0);
- _propShort(xPSetOkButton,"PushButtonType",1);
- _propStringFromResId(xPSetOkButton,"Label",T602FILTER_STR_OK_BUTTON);
- _propBool(xPSetOkButton,"DefaultButton",true);
+ propInt_(xPSetOkButton,"PositionX",70);
+ propInt_(xPSetOkButton,"PositionY",70);
+ propInt_(xPSetOkButton,"Width",50);
+ propInt_(xPSetOkButton,"Height",14);
+ propString_(xPSetOkButton,"Name",T602DLG_OK_BUTTON);
+ propShort_(xPSetOkButton,"TabIndex",0);
+ propShort_(xPSetOkButton,"PushButtonType",1);
+ propStringFromResId_(xPSetOkButton,"Label",T602FILTER_STR_OK_BUTTON);
+ propBool_(xPSetOkButton,"DefaultButton",true);
Reference < XNameContainer > xNameCont (rInstance,UNO_QUERY);
- _Insert(xNameCont, T602DLG_OK_BUTTON, OkButtonModel);
- _Insert(xNameCont, T602DLG_CANCEL_BUTTON, CancelButtonModel);
- _Insert(xNameCont, T602DLG_AZBUKA_CB, AzbCheckBoxModel);
- _Insert(xNameCont, T602DLG_REFORMAT_CB, RefCheckBoxModel);
- _Insert(xNameCont, T602DLG_COMMENT_CB, CommCheckBoxModel);
- _Insert(xNameCont, T602DLG_CODE_LB, ListBoxModel);
- _Insert(xNameCont, T602DLG_CODE_TXT, TextModel);
+ Insert_(xNameCont, T602DLG_OK_BUTTON, OkButtonModel);
+ Insert_(xNameCont, T602DLG_CANCEL_BUTTON, CancelButtonModel);
+ Insert_(xNameCont, T602DLG_AZBUKA_CB, AzbCheckBoxModel);
+ Insert_(xNameCont, T602DLG_REFORMAT_CB, RefCheckBoxModel);
+ Insert_(xNameCont, T602DLG_COMMENT_CB, CommCheckBoxModel);
+ Insert_(xNameCont, T602DLG_CODE_LB, ListBoxModel);
+ Insert_(xNameCont, T602DLG_CODE_TXT, TextModel);
Reference< XUnoControlDialog > dialog = UnoControlDialog::create(rComponentContext);
@@ -1097,11 +1097,11 @@ bool T602ImportFilterDialog::OptionsDlg()
sal_Int16 tt = 0;
- any = _propGet(xPSetAzbukaCB, "State"); any >>= tt; ini.ruscode = tt;
- any = _propGet(xPSetRefCB, "State"); any >>= tt; ini.reformatpars = tt;
- any = _propGet(xPSetCommCB, "State"); any >>= tt; ini.showcomm = tt;
+ any = propGet_(xPSetAzbukaCB, "State"); any >>= tt; ini.ruscode = tt;
+ any = propGet_(xPSetRefCB, "State"); any >>= tt; ini.reformatpars = tt;
+ any = propGet_(xPSetCommCB, "State"); any >>= tt; ini.showcomm = tt;
- any = _propGet(xPSetCodeLB, "SelectedItems"); any >>= shr;
+ any = propGet_(xPSetCodeLB, "SelectedItems"); any >>= shr;
if( shr[0] > 0 ) {
ini.xcode = (tcode)(shr[0]-1);
commit 555619ddf726d22e1769a9fe796e38f805ed1a16
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:51:57 2016 +0200
Avoid reserved identifiers
Change-Id: Ia3a9d2edb9ce7bcf9450dd10589d823383210269
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 2f85621..6c5071d 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILTER_HRC
-#define _FILTER_HRC
+#ifndef INCLUDED_FILTER_INC_HRC
+#define INCLUDED_FILTER_INC_HRC
#include <svl/solar.hrc>
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
index 8eb7516..141ea63 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLFILTERDIALOGSTRINGS_HRC_
-#define _XMLFILTERDIALOGSTRINGS_HRC_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERDIALOGSTRINGS_HRC
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERDIALOGSTRINGS_HRC
#include "filter.hrc"
commit da28ca76faa01cc029de74b6d76a385f31bcc67e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:51:23 2016 +0200
Avoid reserved identifier
Change-Id: Ie86787cdcf96453c94e6859e66b158d9188f3491
diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
index 444c274..5cae0c6 100644
--- a/formula/source/core/inc/core_resource.hrc
+++ b/formula/source/core/inc/core_resource.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FORMULA_CORE_RESOURCE_HRC_
-#define _FORMULA_CORE_RESOURCE_HRC_
+#ifndef INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HRC
+#define INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HRC
#include <svl/solar.hrc>
@@ -31,6 +31,6 @@
#define RID_STRLIST_FUNCTION_NAMES_ENGLISH (RID_CORE_OTHER_START + 2)
#define RID_STRLIST_FUNCTION_NAMES (RID_CORE_OTHER_START + 3)
-#endif // _FORMULA_CORE_RESOURCE_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ea9939269eb08056604a64354537734c567c05cb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:50:55 2016 +0200
Avoid reserved identifiers
Change-Id: Ifc47504370a2ebc8119a60091fdf1ced4b532aa3
diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc
index 86a976b..dd2fb11 100644
--- a/forms/source/inc/frm_resource.hrc
+++ b/forms/source/inc/frm_resource.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRM_RESOURCE_HRC_
-#define _FRM_RESOURCE_HRC_
+#ifndef INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HRC
+#define INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HRC
#include <svl/solar.hrc>
@@ -90,6 +90,6 @@
#define RID_STR_FEATURE_NOT_EXECUTABLE ( RID_FRM_STRINGS_START + 58 )
#define RID_STR_FEATURE_UNKNOWN ( RID_FRM_STRINGS_START + 59 )
-#endif // _FRM_RESOURCE_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index 2844eb0..2086db0 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRM_PROPERTY_HRC_
-#define _FRM_PROPERTY_HRC_
+#ifndef INCLUDED_FORMS_SOURCE_INC_PROPERTY_HRC
+#define INCLUDED_FORMS_SOURCE_INC_PROPERTY_HRC
#include <rtl/ustring.hxx>
#include "frm_strings.hxx"
@@ -297,6 +297,6 @@ namespace frm
}
-#endif // _FRM_PROPERTY_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 13f97509af55fd05abd6688e0de21d085c6258bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:50:47 2016 +0200
Avoid reserved identifiers
Change-Id: I65681e938c809467f9497568149d25f5f68ed5bf
diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc
index 6aaf88e..68356b1 100644
--- a/fpicker/source/office/OfficeFilePicker.hrc
+++ b/fpicker/source/office/OfficeFilePicker.hrc
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _FPICKER_OFFICEFILEPICKER_HRC
-#define _FPICKER_OFFICEFILEPICKER_HRC
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HRC
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HRC
#include <vcl/fpicker.hrc>
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 23bf751..d6c605d 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVTOOLS_IODLGIMPL_HRC
-#define _SVTOOLS_IODLGIMPL_HRC
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HRC
+#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HRC
#include "svtools/helpid.hrc"
#include <vcl/fpicker.hrc>
commit cd96f8998da97b578bde7a58ff1f0d2db8fe0c99
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:50:36 2016 +0200
Avoid reserved identifiers
Change-Id: I13bbc627ba058143862a77d27bbca85f2d961d60
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index d1fdfeb..f0fdc89 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
-#define __FRAMEWORK_CLASSES_RESOURCE_HRC_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HRC
+#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HRC
#define RID_STR_START 2000
#define RID_MENU_START 10000
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 19f74d3..78fd951 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRAMEWORK_HELPID_HRC
-#define _FRAMEWORK_HELPID_HRC
+#ifndef INCLUDED_FRAMEWORK_HELPID_HRC
+#define INCLUDED_FRAMEWORK_HELPID_HRC
#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW"
#define HID_STATUSBAR "FWK_HID_STATUSBAR"
commit 7fb8332701edddb00f7ad8b2ac0c43d8d9a29b3c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:50:19 2016 +0200
Avoid reserved identifiers
Change-Id: Iac8e8e78c3a3f58e8a45b1f28b7d3bb884dd817e
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index 3d7b415..26537a0 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -35,24 +35,24 @@ InputSequenceChecker_hi::~InputSequenceChecker_hi()
{
}
/* Non-Defined Class type */
-#define __ND 0
+#define ND_ 0
/*
* Devanagari character type definitions
*/
-#define __UP 1 // ChandraBindu & Anuswar
-#define __NP 2 // Visarg
-#define __IV 3 // Independent Vowels
-#define __CN 4 // Consonants except _CK & _RC
-#define __CK 5 // Consonants that can be followed by Nukta
-#define __RC 6 // Ra
-#define __NM 7 // Matra
-#define __RM 8 // Ra + HAL
-#define __IM 9 // Choti I Matra
-#define __HL 10 // HAL
-#define __NK 11 // Nukta
-#define __VD 12 // Vedic
-#define __HD 13 // Hindu Numerals
+#define UP_ 1 // ChandraBindu & Anuswar
+#define NP_ 2 // Visarg
+#define IV_ 3 // Independent Vowels
+#define CN_ 4 // Consonants except _CK & _RC
+#define CK_ 5 // Consonants that can be followed by Nukta
+#define RC_ 6 // Ra
+#define NM_ 7 // Matra
+#define RM_ 8 // Ra + HAL
+#define IM_ 9 // Choti I Matra
+#define HL_ 10 // HAL
+#define NK_ 11 // Nukta
+#define VD_ 12 // Vedic
+#define HD_ 13 // Hindu Numerals
/*
* Devanagari character type table
@@ -60,22 +60,22 @@ InputSequenceChecker_hi::~InputSequenceChecker_hi()
static const sal_uInt16 devaCT[128] = {
/* 0, 1, 2, 3, 4, 5, 6, 7,
8, 9, A, B, C, D, E, F, */
-/* 0900 */ __ND, __UP, __UP, __NP, __ND, __IV, __IV, __IV,
- __IV, __IV, __IV, __IV, __IV, __IV, __IV, __IV,
-/* 0910 */ __IV, __IV, __IV, __IV, __IV, __CK, __CK, __CK,
- __CN, __CN, __CN, __CN, __CK, __CN, __CN, __CN,
-/* 0920 */ __CN, __CK, __CK, __CN, __CN, __CN, __CN, __CN,
- __CN, __CN, __CN, __CK, __CN, __CN, __CN, __CN,
-/* 0930 */ __RC, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
- __CN, __CN, __ND, __ND, __NK, __VD, __NM, __IM,
-/* 0940 */ __RM, __NM, __NM, __NM, __NM, __RM, __RM, __RM,
- __RM, __RM, __RM, __RM, __RM, __HL, __ND, __ND,
-/* 0950 */ __ND, __VD, __VD, __VD, __VD, __ND, __ND, __ND,
- __CN, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
-/* 0960 */ __IV, __IV, __NM, __NM, __ND, __ND, __HD, __HD,
- __HD, __HD, __HD, __HD, __HD, __HD, __HD, __HD,
-/* 0970 */ __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
- __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
+/* 0900 */ ND_, UP_, UP_, NP_, ND_, IV_, IV_, IV_,
+ IV_, IV_, IV_, IV_, IV_, IV_, IV_, IV_,
+/* 0910 */ IV_, IV_, IV_, IV_, IV_, CK_, CK_, CK_,
+ CN_, CN_, CN_, CN_, CK_, CN_, CN_, CN_,
+/* 0920 */ CN_, CK_, CK_, CN_, CN_, CN_, CN_, CN_,
+ CN_, CN_, CN_, CK_, CN_, CN_, CN_, CN_,
+/* 0930 */ RC_, CN_, CN_, CN_, CN_, CN_, CN_, CN_,
+ CN_, CN_, ND_, ND_, NK_, VD_, NM_, IM_,
+/* 0940 */ RM_, NM_, NM_, NM_, NM_, RM_, RM_, RM_,
+ RM_, RM_, RM_, RM_, RM_, HL_, ND_, ND_,
+/* 0950 */ ND_, VD_, VD_, VD_, VD_, ND_, ND_, ND_,
+ CN_, CN_, CN_, CN_, CN_, CN_, CN_, CN_,
+/* 0960 */ IV_, IV_, NM_, NM_, ND_, ND_, HD_, HD_,
+ HD_, HD_, HD_, HD_, HD_, HD_, HD_, HD_,
+/* 0970 */ ND_, ND_, ND_, ND_, ND_, ND_, ND_, ND_,
+ ND_, ND_, ND_, ND_, ND_, ND_, ND_, ND_,
};
/*
@@ -105,7 +105,7 @@ sal_Bool DEV_Composible[2][2] = {
};
#define getCharType(x) \
- ((x >= 0x0900 && x < 0x097f) ? devaCT[x - 0x0900] : __ND)
+ ((x >= 0x0900 && x < 0x097f) ? devaCT[x - 0x0900] : ND_)
sal_Bool SAL_CALL
InputSequenceChecker_hi::checkInputSequence(const OUString& Text,
commit d74faef25d5489874a5b1887a34bc7dfb548bc9c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:49:39 2016 +0200
Avoid reserved identifiers
Change-Id: I93e7c254f8777c2dfbb192b306c991387d9cc641
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 60a318a..00aafb0 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RPTUI_DLGRESID_HRC
-#define _RPTUI_DLGRESID_HRC
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTRESID_HRC
+#define INCLUDED_REPORTDESIGN_INC_RPTRESID_HRC
#include <svl/solar.hrc>
@@ -246,6 +246,6 @@
#define RID_STR_VERTICAL_ALIGN_CONST (RID_UNTYPED_START + 7)
#define RID_STR_PARAADJUST_CONST (RID_UNTYPED_START + 8)
-#endif // _RPTUI_DLGRESID_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc
index 5a62580..2c553c7 100644
--- a/reportdesign/inc/rptui_slotid.hrc
+++ b/reportdesign/inc/rptui_slotid.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RPTUI_SLOTID_HRC_
-#define _RPTUI_SLOTID_HRC_
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTUI_SLOTID_HRC
+#define INCLUDED_REPORTDESIGN_INC_RPTUI_SLOTID_HRC
#include <svx/svxids.hrc>
@@ -199,6 +199,6 @@
#define SID_COLLAPSE_SECTION ( SID_RPTUI_START + 167 )
#define SID_EXPAND_SECTION ( SID_RPTUI_START + 168 )
-#endif // _RPTUI_SLOTID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
index 1927eaf..1cfe717 100644
--- a/reportdesign/source/inc/stringconstants.hrc
+++ b/reportdesign/source/inc/stringconstants.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _REPORTDESIGN_STRINGCONSTANTS_HRC_
-#define _REPORTDESIGN_STRINGCONSTANTS_HRC_
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC
+#define INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC
#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT
#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
@@ -251,6 +251,7 @@
#define PROPERTY_ORDER "Order"
#define PROPERTY_APPLYFILTER "ApplyFilter"
#define PROPERTY_MAXROWS "MaxRows"
-#endif // _REPORTDESIGN_STRINGCONSTANTS_HRC_
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1bfc7d0a89c317de1bf6819ffa14a1074bb49be0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:49:15 2016 +0200
Avoid reserved identifiers
Change-Id: I4d4e928f7542aee69362fdaab8015ab379327b95
diff --git a/sc/inc/math.hxx b/sc/inc/math.hxx
index 2740d76..13355a9 100644
--- a/sc/inc/math.hxx
+++ b/sc/inc/math.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __INCLUDED_SC_INC_MATH_HXX__
-#define __INCLUDED_SC_INC_MATH_HXX__
+#ifndef INCLUDED_SC_INC_MATH_HXX
+#define INCLUDED_SC_INC_MATH_HXX
#include <formula/errorcodes.hxx>
diff --git a/sc/source/ui/inc/checklistmenu.hrc b/sc/source/ui/inc/checklistmenu.hrc
index 85dd506..7d00957 100644
--- a/sc/source/ui/inc/checklistmenu.hrc
+++ b/sc/source/ui/inc/checklistmenu.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __SC_CHECKLISTMENU_HRC__
-#define __SC_CHECKLISTMENU_HRC__
+#ifndef INCLUDED_SC_SOURCE_UI_INC_CHECKLISTMENU_HRC
+#define INCLUDED_SC_SOURCE_UI_INC_CHECKLISTMENU_HRC
#include <sc.hrc>
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index bb11c1a..c4cf9b7 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _SC_CONDFORMATUNO_HXX_
-#define _SC_CONDFORMATUNO_HXX_
+#ifndef INCLUDED_SC_SOURCE_UI_INC_CONDFORMATUNO_HXX
+#define INCLUDED_SC_SOURCE_UI_INC_CONDFORMATUNO_HXX
#include "address.hxx"
commit 942b760088cde7e4b87bba132443f01ebd939a33
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:48:46 2016 +0200
Avoid reserved identifiers
Change-Id: I41a490832c9dd312775f420807e4bed93557a24e
diff --git a/scaddins/source/datefunc/datefunc.hrc b/scaddins/source/datefunc/datefunc.hrc
index aade808..f0739e1 100644
--- a/scaddins/source/datefunc/datefunc.hrc
+++ b/scaddins/source/datefunc/datefunc.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SCA_DATEFUNC_HRC
-#define _SCA_DATEFUNC_HRC
+#ifndef INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HRC
+#define INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HRC
#define DATE_RESOURCE_START 1000
diff --git a/scaddins/source/pricing/pricing.hrc b/scaddins/source/pricing/pricing.hrc
index 64cd4c1..1c43e04 100644
--- a/scaddins/source/pricing/pricing.hrc
+++ b/scaddins/source/pricing/pricing.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SCA_PRICING_HRC
-#define _SCA_PRICING_HRC
+#ifndef INCLUDED_SCADDINS_SOURCE_PRICING_PRICING_HRC
+#define INCLUDED_SCADDINS_SOURCE_PRICING_PRICING_HRC
#define PRICING_RESOURCE_START 1000
commit 412471ccb001f8805cc9c5e5e3e8fa24be71f5e2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:48:33 2016 +0200
Avoid reserved identifiers
Change-Id: Iaa556ac8ce6a2220ab3643968193fbab5077a56f
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 0c05093..e9b5755 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_APP_HRC_
-#define _SD_APP_HRC_
+#ifndef INCLUDED_SD_INC_APP_HRC
+#define INCLUDED_SD_INC_APP_HRC
#include <sfx2/sfx.hrc>
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 70d7186..bec03c2 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDGLOB_HRC
-#define _SDGLOB_HRC
+#ifndef INCLUDED_SD_INC_GLOB_HRC
+#define INCLUDED_SD_INC_GLOB_HRC
#include <sfx2/sfx.hrc>
@@ -136,6 +136,7 @@
#define RID_SLIDESORTER_ICONS RID_GLOB_START+227
#define STR_DEAUTHORISE_CLIENT RID_GLOB_START+229
-#endif // _SDGLOB_HRC
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 8ba4028..e275090 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDATTR_HRC
-#define _SDATTR_HRC
+#ifndef INCLUDED_SD_INC_SDATTR_HRC
+#define INCLUDED_SD_INC_SDATTR_HRC
#include <sfx2/sfx.hrc>
@@ -165,6 +165,6 @@
#define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1
#define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT
-#endif // _SDATTR_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc
index b3145f0..c2c7c43 100644
--- a/sd/source/ui/accessibility/accessibility.hrc
+++ b/sd/source/ui/accessibility/accessibility.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_ACCESSIBILITY_HRC
-#define _SD_ACCESSIBILITY_HRC
+#ifndef INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC
+#define INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC
#include <sfx2/sfx.hrc>
@@ -77,6 +77,7 @@
#define SID_SD_A11Y_I_PREVIEW_D (SID_SD_A11Y_START + 47)
#define SID_SD_A11Y_I_PREVIEW_SUFFIX (SID_SD_A11Y_START + 48)
#define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49)
-#endif /* _SD_ACCESSIBILITY_HRC */
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 0348eed..297a9f2 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_CUSTOMANIMATION_HRC
-#define _SD_CUSTOMANIMATION_HRC
+#ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC
+#define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC
#include "glob.hrc"
@@ -114,6 +114,6 @@
#define CM_ITALIC 2
#define CM_UNDERLINED 3
-#endif // _SD_CUSTOMANIMATION_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc
index 685664f..813c624 100644
--- a/sd/source/ui/annotations/annotations.hrc
+++ b/sd/source/ui/annotations/annotations.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_ANNOTATIONPANE_HRC
-#define _SD_ANNOTATIONPANE_HRC
+#ifndef INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC
+#define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC
#include "glob.hrc"
@@ -41,6 +41,6 @@
#define RID_ANNOTATION_CONTEXTMENU (RID_ANNOTATIONS_START+0)
#define RID_ANNOTATION_TAG_CONTEXTMENU (RID_ANNOTATIONS_START+1)
-#endif // _SD_ANNOTATIONPANE_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 028dcd41ab6b28732e168d834ec76d1c67020eda
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:48:23 2016 +0200
Avoid reserved identifier
Change-Id: I0d75653dcde39b0fbd8af723295262615978d903
diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc
index b9fe956..809e11e 100644
--- a/sdext/source/minimizer/optimizerdialog.hrc
+++ b/sdext/source/minimizer/optimizerdialog.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OPTIMIZERDIALOG_HRC
-#define _OPTIMIZERDIALOG_HRC
+#ifndef SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HRC
+#define SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HRC
#define ITEM_ID_INTRODUCTION 0
#define ITEM_ID_SLIDES 1
commit 830a86731414d81c2f36ba97c620e9d794ec94c4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:48:14 2016 +0200
Avoid reserved identifier
Change-Id: I31b50e58e3bce9448ae8de127171c0a1f25fa1af
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 7f9fc54..15e8ef0 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _STARMATH_HRC
-#define _STARMATH_HRC
+#ifndef INCLUDED_STARMATH_INC_STARMATH_HRC
+#define INCLUDED_STARMATH_INC_STARMATH_HRC
#include <svl/solar.hrc>
#include <sfx2/sfxsids.hrc>
commit 4f2b9f026d582350da71d7f4015bfaaf2c7030ce
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 19:48:00 2016 +0200
Avoid reserved identifiers
Change-Id: Ib8cbcdff79ad8d621b8e9567df0afe32e9501279
diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
index 1b36f26..37cdc61 100644
--- a/sw/inc/access.hrc
+++ b/sw/inc/access.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCESS_HRC
-#define _ACCESS_HRC
+#ifndef INCLUDED_SW_INC_ACCESS_HRC
+#define INCLUDED_SW_INC_ACCESS_HRC
#include "rcid.hrc"
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 279b2a7..d66c656 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CHRDLG_HRC
-#define _CHRDLG_HRC
+#ifndef INCLUDED_SW_INC_CHRDLG_HRC
+#define INCLUDED_SW_INC_CHRDLG_HRC
#include "rcid.hrc"
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index f56dd08..1d73e40 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMCORE_HRC
-#define _COMCORE_HRC
+#ifndef INCLUDED_SW_INC_COMCORE_HRC
+#define INCLUDED_SW_INC_COMCORE_HRC
#include "rcid.hrc"
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index e85523b..5557fa3 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBUI_HRC
-#define _DBUI_HRC
+#ifndef INCLUDED_SW_INC_DBUI_HRC
+#define INCLUDED_SW_INC_DBUI_HRC
#include "rcid.hrc"
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 769101d..f65b7f9 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DIALOG_HRC
-#define _DIALOG_HRC
+#ifndef INCLUDED_SW_INC_DIALOG_HRC
+#define INCLUDED_SW_INC_DIALOG_HRC
#include "rcid.hrc"
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index 4e4f7f6..6b03f5e 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCHDL_HRC
-#define _DOCHDL_HRC
+#ifndef INCLUDED_SW_INC_DOCHDL_HRC
+#define INCLUDED_SW_INC_DOCHDL_HRC
#include "rcid.hrc"
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index d9e73c3..5bc9789 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ENVELP_HRC
-#define _ENVELP_HRC
+#ifndef INCLUDED_SW_INC_ENVELP_HRC
+#define INCLUDED_SW_INC_ENVELP_HRC
#include "rcid.hrc"
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index ab53fea..c48dbd1 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FLDUI_HRC
-#define _FLDUI_HRC
+#ifndef INCLUDED_SW_INC_FLDUI_HRC
+#define INCLUDED_SW_INC_FLDUI_HRC
#include "rcid.hrc"
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 4471435..1959e52 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _GLOBALS_HRC
-#define _GLOBALS_HRC
+#ifndef INCLUDED_SW_INC_GLOBALS_HRC
+#define INCLUDED_SW_INC_GLOBALS_HRC
#include "rcid.hrc"
@@ -211,6 +211,6 @@
#define SID_WRT_SHELL (RC_GLOBALS_BEGIN + 117)
-#endif // _GLOBALS_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index aa4b984..ce3643a 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -21,8 +21,8 @@
#define RC_INDEX_BEGIN 256
*/
-#ifndef _INDEX_HRC
-#define _INDEX_HRC
+#ifndef INCLUDED_SW_INC_INDEX_HRC
+#define INCLUDED_SW_INC_INDEX_HRC
#include "rcid.hrc"
@@ -74,6 +74,6 @@
#define STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
#define STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
-#endif // _INDEX_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index ddcf72a..a6b472b 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _POOLFMT_HRC
-#define _POOLFMT_HRC
+#ifndef INCLUDED_SW_INC_POOLFMT_HRC
+#define INCLUDED_SW_INC_POOLFMT_HRC
#include "rcid.hrc"
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index f809588..528c5bb 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RDIC_HRC
-#define _RDIC_HRC
+#ifndef INCLUDED_SW_INC_RCID_HRC
+#define INCLUDED_SW_INC_RCID_HRC
#include <sfx2/sfxsids.hrc>
diff --git a/sw/inc/statstr.hrc b/sw/inc/statstr.hrc
index 2afca6f..813a3bf 100644
--- a/sw/inc/statstr.hrc
+++ b/sw/inc/statstr.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _STATSTR_HRC
-#define _STATSTR_HRC
+#ifndef INCLUDED_SW_INC_STATSTR_HRC
+#define INCLUDED_SW_INC_STATSTR_HRC
#include "rcid.hrc"
diff --git a/sw/inc/unocore.hrc b/sw/inc/unocore.hrc
index 13bdaaf..7f8dbde 100644
--- a/sw/inc/unocore.hrc
+++ b/sw/inc/unocore.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOCORE_HRC
-#define _UNOCORE_HRC
+#ifndef INCLUDED_SW_INC_UNOCORE_HRC
+#define INCLUDED_SW_INC_UNOCORE_HRC
#include "rcid.hrc"
diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc
index 59195ee..7a02bb2 100644
--- a/sw/source/core/inc/pagefrm.hrc
+++ b/sw/source/core/inc/pagefrm.hrc
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _PAGEFRM_HRC
-#define _PAGEFRM_HRC
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HRC
+#define INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HRC
#include "rcid.hrc"
diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc
index ee1da91..2de8d42 100644
--- a/sw/source/ui/config/config.hrc
+++ b/sw/source/ui/config/config.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list