[Libreoffice-commits] core.git: 28 commits - basctl/inc basctl/source basic/source cui/source dbaccess/source filter/source hwpfilter/source include/editeng include/filter include/sfx2 l10ntools/inc l10ntools/source sal/osl sc/inc sc/source sd/source sfx2/source sw/inc sw/source unotools/source vcl/headless vcl/unx xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 12 13:50:50 UTC 2016
basctl/inc/basidesh.hrc | 11
basctl/source/basicide/brkdlg.cxx | 3
basic/source/runtime/stdobj.cxx | 786 +++++++++----------
basic/source/sbx/sbxform.cxx | 10
cui/source/dialogs/scriptdlg.cxx | 1
cui/source/dialogs/scriptdlg.hrc | 26
cui/source/dialogs/scriptdlg.src | 1
dbaccess/source/inc/dbu_reghelper.hxx | 4
dbaccess/source/inc/flt_reghelper.hxx | 4
dbaccess/source/inc/registrationhelper.hxx | 2
dbaccess/source/shared/dbu_reghelper.cxx | 4
dbaccess/source/shared/flt_reghelper.cxx | 4
dbaccess/source/shared/registrationhelper.cxx | 2
filter/source/config/cache/cacheitem.cxx | 46 -
filter/source/config/cache/contenthandlerfactory.cxx | 6
filter/source/config/cache/filtercache.cxx | 12
filter/source/config/cache/filterfactory.cxx | 6
filter/source/config/cache/frameloaderfactory.cxx | 6
filter/source/config/cache/macros.hxx | 10
filter/source/config/cache/versions.hxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/svg/svgexport.cxx | 7
filter/source/xsltfilter/LibXSLTTransformer.cxx | 7
hwpfilter/source/datecode.h | 23
hwpfilter/source/hbox.cxx | 22
hwpfilter/source/hwplib.h | 9
include/editeng/eeitemid.hxx | 6
include/filter/msfilter/escherex.hxx | 8
include/sfx2/module.hxx | 3
l10ntools/inc/tokens.h | 2
l10ntools/source/export.cxx | 2
l10ntools/source/gRun.sh | 2
l10ntools/source/srclex.l | 4
sal/osl/unx/file_volume.cxx | 110 +-
sc/inc/scitems.hxx | 2
sc/source/core/data/table4.cxx | 4
sc/source/filter/inc/tool.h | 8
sc/source/filter/lotus/tool.cxx | 4
sd/source/filter/eppt/epptso.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 52 -
sd/source/ui/view/DocumentRenderer.hrc | 60 -
sd/source/ui/view/DocumentRenderer.src | 60 -
sfx2/source/doc/Metadatable.cxx | 22
sw/inc/ftnidx.hxx | 2
sw/source/core/doc/DocumentRedlineManager.cxx | 32
sw/source/core/doc/docftn.cxx | 4
sw/source/core/doc/ftnidx.cxx | 6
sw/source/core/docnode/ndsect.cxx | 4
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/untbl.cxx | 20
sw/source/core/unocore/unomap.cxx | 18
sw/source/core/unocore/unomap1.cxx | 30
sw/source/core/unocore/unomapproperties.hxx | 28
unotools/source/config/defaultoptions.cxx | 92 +-
vcl/headless/svpframe.cxx | 6
vcl/unx/generic/window/salframe.cxx | 16
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 28
57 files changed, 781 insertions(+), 874 deletions(-)
New commits:
commit 2e18f598c7aa6bbf299bd1a4e9c854393a23e27a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 15:49:28 2016 +0200
loplugin:unreffun
Change-Id: Ia0f7e2507438cb966e45306d6d018d652a307601
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 9892e49..9f3edfa 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1638,26 +1638,4 @@ throw (uno::RuntimeException, std::exception)
} // namespace sfx2
-
-#if OSL_DEBUG_LEVEL > 0
-
-#include <stdio.h>
-
-static void dump(sfx2::XmlIdList_t * pList)
-#ifdef __GNUC__
-__attribute__ ((unused))
-#endif
-;
-static void dump(sfx2::XmlIdList_t * pList)
-{
- fprintf(stderr, "\nXmlIdList(%p): ", pList);
- for (sfx2::XmlIdList_t::iterator i = pList->begin(); i != pList->end(); ++i)
- {
- fprintf(stderr, "%p ", *i);
- }
- fprintf(stderr, "\n");
-}
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9141c65b541bf6860bc8dd0c6ae1924f211b1139
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 12:23:19 2016 +0200
Avoid reserved identifiers
Change-Id: Iefc0bf0e7d64b0ed4b339ca89191649e4bc6fba2
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 4686f3e..10f538e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -336,7 +336,7 @@ namespace {
{
public:
DialogCreator (ViewShellBase &rBase, bool bImpress, sal_Int32 nCurPage)
- : Resource(SdResId(_STR_IMPRESS_PRINT_UI_OPTIONS))
+ : Resource(SdResId(STR_IMPRESS_PRINT_UI_OPTIONS))
, mrBase(rBase)
, mbImpress(bImpress)
, mnCurPage(nCurPage)
@@ -373,7 +373,7 @@ namespace {
maProperties.push_back(aOptionsUIFile);
SvtModuleOptions aOpt;
- OUString aAppGroupname(SD_RESSTR(_STR_IMPRESS_PRINT_UI_GROUP_NAME));
+ OUString aAppGroupname(SD_RESSTR(STR_IMPRESS_PRINT_UI_GROUP_NAME));
aAppGroupname = aAppGroupname.replaceFirst("%s", aOpt.GetModuleName(
mbImpress ? SvtModuleOptions::EModule::IMPRESS : SvtModuleOptions::EModule::DRAW));
AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
@@ -384,7 +384,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
aPrintOpt.maGroupHint = "JobPage" ;
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_PRINT_GROUP),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_PRINT_GROUP),
"",
aPrintOpt ));
@@ -392,10 +392,10 @@ namespace {
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"impressdocument",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_CONTENT),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_CONTENT),
aHelpIds,
"PageContentType" ,
- CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
+ CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
0)
);
@@ -403,7 +403,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( "PageContentType" , 1 );
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpage",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
aHelpIds,
"SlidesPerPage" ,
GetSlidesPerPageSequence(),
@@ -417,10 +417,10 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, true );
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpageorder",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_ORDER),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_ORDER),
aHelpIds,
"SlidesPerPageOrder" ,
- CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
+ CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
0,
Sequence< sal_Bool >(),
aSlidesPerPageOpt )
@@ -428,12 +428,12 @@ namespace {
}
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("contents",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) );
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) );
if( mbImpress )
{
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
"IsPrintName" ,
false
@@ -443,7 +443,7 @@ namespace {
else
{
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname",
- SD_RESSTR(_STR_DRAW_PRINT_UI_IS_PRINT_NAME),
+ SD_RESSTR(STR_DRAW_PRINT_UI_IS_PRINT_NAME),
".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
"IsPrintName" ,
false
@@ -452,7 +452,7 @@ namespace {
}
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printdatetime",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" ,
"IsPrintDateTime" ,
false
@@ -462,7 +462,7 @@ namespace {
if( mbImpress )
{
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printhidden",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" ,
"IsPrintHidden" ,
false
@@ -471,7 +471,7 @@ namespace {
}
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("color",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_QUALITY), "" ) );
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_QUALITY), "" ) );
aHelpIds.realloc( 3 );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ;
@@ -486,12 +486,12 @@ namespace {
"",
aHelpIds,
"Quality" ,
- CreateChoice(_STR_IMPRESS_PRINT_UI_QUALITY_CHOICES),
+ CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES),
0)
);
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesizes",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) );
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) );
aHelpIds.realloc( 4 );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ;
@@ -510,7 +510,7 @@ namespace {
"",
aHelpIds,
"PageOptions" ,
- CreateChoice(mbImpress ? _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
+ CreateChoice(mbImpress ? STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
0,
Sequence< sal_Bool >(),
aPageOptionsOpt
@@ -520,12 +520,12 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt;
aBrochureOpt.maGroupHint = "LayoutPage" ;
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesides",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_SIDES), "",
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_SIDES), "",
aBrochureOpt ) );
// brochure printing
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("brochure",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_BROCHURE),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_BROCHURE),
".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" ,
"PrintProspect" ,
false,
@@ -540,10 +540,10 @@ namespace {
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ;
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"brochureinclude",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
aHelpIds,
"PrintProspectInclude" ,
- CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
+ CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
0,
Sequence< sal_Bool >(),
aIncludeOpt
@@ -554,7 +554,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup" ;
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printpaperfromsetup",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAPER_TRAY),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_PAPER_TRAY),
".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" ,
"PrintPaperFromSetup" ,
false,
@@ -566,7 +566,7 @@ namespace {
aPrintRangeOpt.mbInternalOnly = true;
aPrintRangeOpt.maGroupHint = "PrintRange" ;
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("printrange",
- SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_RANGE),
+ SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_RANGE),
"",
aPrintRangeOpt )
);
@@ -613,8 +613,8 @@ namespace {
aHelpIds,
aPrintRangeName,
CreateChoice(mbImpress
- ? _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
- : _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE),
+ ? STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
+ : STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE),
nPrintRange )
);
// create a an Edit dependent on "Pages" selected
@@ -649,7 +649,7 @@ namespace {
Sequence<OUString> GetSlidesPerPageSequence()
{
const Sequence<OUString> aChoice (
- CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES));
+ CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES));
maSlidesPerPage.clear();
maSlidesPerPage.push_back(0); // first is using the default
for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex)
diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc
index 942e83f..1261ca5 100644
--- a/sd/source/ui/view/DocumentRenderer.hrc
+++ b/sd/source/ui/view/DocumentRenderer.hrc
@@ -17,38 +17,38 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _STR_IMPRESS_PRINT_UI_OPTIONS 32001
-#define _STR_IMPRESS_PRINT_UI_GROUP_NAME 1
-#define _STR_IMPRESS_PRINT_UI_PRINT_CONTENT 2
-#define _STR_IMPRESS_PRINT_UI_PRINT_GROUP 3
-#define _STR_IMPRESS_PRINT_UI_CONTENT 4
-#define _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 6
-#define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE 7
-#define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES 8
-#define _STR_IMPRESS_PRINT_UI_ORDER 10
-#define _STR_IMPRESS_PRINT_UI_ORDER_CHOICES 11
-#define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13
-#define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14
-#define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16
-#define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20
+#define STR_IMPRESS_PRINT_UI_OPTIONS 32001
+#define STR_IMPRESS_PRINT_UI_GROUP_NAME 1
+#define STR_IMPRESS_PRINT_UI_PRINT_CONTENT 2
+#define STR_IMPRESS_PRINT_UI_PRINT_GROUP 3
+#define STR_IMPRESS_PRINT_UI_CONTENT 4
+#define STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 6
+#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE 7
+#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES 8
+#define STR_IMPRESS_PRINT_UI_ORDER 10
+#define STR_IMPRESS_PRINT_UI_ORDER_CHOICES 11
+#define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13
+#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14
+#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16
+#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20
-#define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22
-#define _STR_IMPRESS_PRINT_UI_QUALITY 23
-#define _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES 24
-#define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS 26
-#define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES 27
-#define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW 28
-#define _STR_IMPRESS_PRINT_UI_BROCHURE 30
-#define _STR_IMPRESS_PRINT_UI_PAGE_SIDES 32
-#define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE 33
-#define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST 35
-#define _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP 37
-#define _STR_IMPRESS_PRINT_UI_PAPER_TRAY 38
+#define STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22
+#define STR_IMPRESS_PRINT_UI_QUALITY 23
+#define STR_IMPRESS_PRINT_UI_QUALITY_CHOICES 24
+#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS 26
+#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES 27
+#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW 28
+#define STR_IMPRESS_PRINT_UI_BROCHURE 30
+#define STR_IMPRESS_PRINT_UI_PAGE_SIDES 32
+#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE 33
+#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST 35
+#define STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP 37
+#define STR_IMPRESS_PRINT_UI_PAPER_TRAY 38
-#define _STR_IMPRESS_PRINT_UI_PAGE_RANGE 40
-#define _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE 41
-#define _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE 43
+#define STR_IMPRESS_PRINT_UI_PAGE_RANGE 40
+#define STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE 41
+#define STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE 43
-#define _STR_DRAW_PRINT_UI_IS_PRINT_NAME 44
+#define STR_DRAW_PRINT_UI_IS_PRINT_NAME 44
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src
index 2594124..ed0b851 100644
--- a/sd/source/ui/view/DocumentRenderer.src
+++ b/sd/source/ui/view/DocumentRenderer.src
@@ -20,25 +20,25 @@
#include "app.hrc"
#include "DocumentRenderer.hrc"
-Resource _STR_IMPRESS_PRINT_UI_OPTIONS
+Resource STR_IMPRESS_PRINT_UI_OPTIONS
{
- String _STR_IMPRESS_PRINT_UI_GROUP_NAME
+ String STR_IMPRESS_PRINT_UI_GROUP_NAME
{
Text [en-US] = "%PRODUCTNAME %s";
};
- String _STR_IMPRESS_PRINT_UI_PRINT_CONTENT
+ String STR_IMPRESS_PRINT_UI_PRINT_CONTENT
{
Text [ en-US ] = "Print content";
};
- String _STR_IMPRESS_PRINT_UI_PRINT_GROUP
+ String STR_IMPRESS_PRINT_UI_PRINT_GROUP
{
Text [ en-US ] = "Print";
};
- String _STR_IMPRESS_PRINT_UI_CONTENT
+ String STR_IMPRESS_PRINT_UI_CONTENT
{
Text [ en-US ] = "Document";
};
- StringArray _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES
+ StringArray STR_IMPRESS_PRINT_UI_CONTENT_CHOICES
{
ItemList [ en-US ] =
{
@@ -48,11 +48,11 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
< "Outline" ; > ;
};
};
- String _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE
+ String STR_IMPRESS_PRINT_UI_SLIDESPERPAGE
{
Text [ en-US ] = "Slides per page" ;
};
- StringArray _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES
+ StringArray STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES
{
ItemList [ en-US ] =
{
@@ -65,11 +65,11 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
< "9" ; > ;
};
};
- String _STR_IMPRESS_PRINT_UI_ORDER
+ String STR_IMPRESS_PRINT_UI_ORDER
{
Text [ en-US ] = "Order" ;
};
- StringArray _STR_IMPRESS_PRINT_UI_ORDER_CHOICES
+ StringArray STR_IMPRESS_PRINT_UI_ORDER_CHOICES
{
ItemList [ en-US ] =
{
@@ -77,35 +77,35 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
< "Top to bottom, then right" ; > ;
};
};
- String _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT
+ String STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT
{
Text [ en-US ] = "~Contents";
};
- String _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME
+ String STR_IMPRESS_PRINT_UI_IS_PRINT_NAME
{
Text [ en-US ] = "~Slide name";
};
- String _STR_DRAW_PRINT_UI_IS_PRINT_NAME
+ String STR_DRAW_PRINT_UI_IS_PRINT_NAME
{
Text [ en-US ] = "P~age name";
};
- String _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE
+ String STR_IMPRESS_PRINT_UI_IS_PRINT_DATE
{
Text [ en-US ] = "~Date and time";
};
- String _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN
+ String STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN
{
Text [ en-US ] = "Hidden pages";
};
- String _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP
+ String STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP
{
Text [ en-US ] = "Output options";
};
- String _STR_IMPRESS_PRINT_UI_QUALITY
+ String STR_IMPRESS_PRINT_UI_QUALITY
{
Text [ en-US ] = "Color";
};
- StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES
+ StringArray STR_IMPRESS_PRINT_UI_QUALITY_CHOICES
{
ItemList [ en-US ] =
{
@@ -114,11 +114,11 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
< "Black & white" ; > ;
};
};
- String _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS
+ String STR_IMPRESS_PRINT_UI_PAGE_OPTIONS
{
Text [ en-US ] = "~Size";
};
- StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES
+ StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES
{
ItemList [ en-US ] =
{
@@ -128,7 +128,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
< "Tile sheet of paper with repeated slides" ; > ;
};
};
- StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW
+ StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW
{
ItemList [ en-US ] =
{
@@ -138,19 +138,19 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
< "Tile sheet of paper with repeated pages" ; > ;
};
};
- String _STR_IMPRESS_PRINT_UI_BROCHURE
+ String STR_IMPRESS_PRINT_UI_BROCHURE
{
Text [en-US] = "Brochure";
};
- String _STR_IMPRESS_PRINT_UI_PAGE_SIDES
+ String STR_IMPRESS_PRINT_UI_PAGE_SIDES
{
Text [ en-US ] = "Page sides";
};
- String _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE
+ String STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE
{
Text [ en-US ] = "Include";
};
- StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST
+ StringArray STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST
{
ItemList [ en-US ] =
{
@@ -160,19 +160,19 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
};
};
- String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP
+ String STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP
{
Text [ en-US ] = "Paper tray";
};
- String _STR_IMPRESS_PRINT_UI_PAPER_TRAY
+ String STR_IMPRESS_PRINT_UI_PAPER_TRAY
{
Text [ en-US ] = "~Use only paper tray from printer preferences";
};
- String _STR_IMPRESS_PRINT_UI_PAGE_RANGE
+ String STR_IMPRESS_PRINT_UI_PAGE_RANGE
{
Text [en-US] = "Print range";
};
- StringArray _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
+ StringArray STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
{
ItemList [ en-US ] =
{
@@ -182,7 +182,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
};
};
- StringArray _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE
+ StringArray STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE
{
ItemList [ en-US ] =
{
commit 06c536c61aa25570e34114c32f4f766340355bcc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 10:47:36 2016 +0200
Avoid reserved identifiers
Change-Id: I3149c64903825ddd1f751425436cfa0285c84a6f
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index ef6561d..30409a0 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -213,7 +213,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ OUString(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
{ OUString(UNO_NAME_ROW_SPAN), FN_UNO_CELL_ROW_SPAN, cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString(UNO_NAME_CELL_INTEROP_GRAB_BAG), RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
- _REDLINE_NODE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
m_aMapEntriesArr[nPropertyId] = aCellMap_Impl;
@@ -346,7 +346,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTOXIndexMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_USE_ALPHABETICAL_SEPARATORS), WID_USE_ALPHABETICAL_SEPARATORS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
@@ -384,7 +384,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTOXContentMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_LEVEL), WID_LEVEL , cppu::UnoType<sal_Int16>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS), WID_HIDE_TABLEADER_PAGENUMBERS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
@@ -426,7 +426,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTOXUserMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS), WID_HIDE_TABLEADER_PAGENUMBERS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_TAB_IN_TOC), WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
@@ -472,7 +472,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTOXTablesMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_CREATE_FROM_LABELS), WID_CREATE_FROM_LABELS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
@@ -497,7 +497,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTOXObjectsMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_USE_ALPHABETICAL_SEPARATORS), WID_USE_ALPHABETICAL_SEPARATORS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
@@ -525,7 +525,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTOXIllustrationsMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_CREATE_FROM_LABELS), WID_CREATE_FROM_LABELS , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
@@ -588,7 +588,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aBibliographyMap_Impl[] =
{
- _BASE_INDEX_PROPERTIES_
+ BASE_INDEX_PROPERTIES_
{ OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_TEXT_COLUMNS), RES_COL, cppu::UnoType<css::text::XTextColumns>::get(), PROPERTY_NONE, MID_COLUMNS},
{ OUString(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL },
@@ -1406,7 +1406,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aTextMap[] =
{
- _REDLINE_NODE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
m_aMapEntriesArr[nPropertyId] = aTextMap;
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index f739c94..5c81b29 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -203,9 +203,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetCharStylePropertyMa
{ OUString(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT, cppu::UnoType<sal_Int8>::get() , PROPERTY_NONE, MID_ESC_HEIGHT},
{ OUString(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
- _STANDARD_FONT_PROPERTIES
- _CJK_FONT_PROPERTIES
- _CTL_FONT_PROPERTIES
+ STANDARD_FONT_PROPERTIES
+ CJK_FONT_PROPERTIES
+ CTL_FONT_PROPERTIES
{ OUString(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE , cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_TL_STYLE},
{ OUString(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE , cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_TL_COLOR},
{ OUString(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE , cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_TL_HASCOLOR},
@@ -226,7 +226,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetCharStylePropertyMa
{ OUString(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES, cppu::UnoType<OUString>::get(), PROPERTY_NONE, MID_START_BRACKET},
{ OUString(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES, cppu::UnoType<OUString>::get(), PROPERTY_NONE, MID_END_BRACKET},
{ OUString(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_EMPHASIS},
- _PROP_DIFF_FONTHEIGHT
+ PROP_DIFF_FONTHEIGHT
{ OUString(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_ROTATE },
{ OUString(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FITTOLINE },
{ OUString(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
@@ -264,9 +264,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetAutoCharStyleProper
{ OUString(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT, cppu::UnoType<sal_Int8>::get() , PROPERTY_NONE, MID_ESC_HEIGHT},
{ OUString(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
{ OUString(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},
- _STANDARD_FONT_PROPERTIES
- _CJK_FONT_PROPERTIES
- _CTL_FONT_PROPERTIES
+ STANDARD_FONT_PROPERTIES
+ CJK_FONT_PROPERTIES
+ CTL_FONT_PROPERTIES
{ OUString(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE , cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_TL_STYLE},
{ OUString(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE , cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_TL_COLOR},
{ OUString(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE , cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_TL_HASCOLOR},
@@ -682,7 +682,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTablePropertyMap()
{ OUString(UNO_NAME_PAGE_STYLE_NAME), RES_PAGEDESC, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
// #i29550#
{ OUString(UNO_NAME_COLLAPSING_BORDERS), RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
- _REDLINE_NODE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{ OUString(UNO_NAME_TABLE_INTEROP_GRAB_BAG), RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -752,7 +752,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetSectionPropertyMap(
{ OUString(UNO_NAME_PROTECTION_KEY), WID_SECT_PASSWORD, cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
{ OUString(UNO_NAME_DONT_BALANCE_TEXT_COLUMNS), RES_COLUMNBALANCE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
COMMON_TEXT_CONTENT_PROPERTIES
- _REDLINE_NODE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{ OUString(UNO_NAME_IS_CURRENTLY_VISIBLE), WID_SECT_CURRENTLY_VISIBLE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
{ OUString(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
{ OUString(UNO_NAME_SECT_LEFT_MARGIN), RES_LR_SPACE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
@@ -771,7 +771,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFramePropertyMap()
// add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
// COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
COMMON_FRAME_PROPERTIES
- _REDLINE_NODE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{ OUString(UNO_NAME_CHAIN_NEXT_NAME), RES_CHAIN, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
{ OUString(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
/*not impl*/ { OUString(UNO_NAME_CLIENT_MAP), RES_URL, cppu::UnoType<bool>::get(), PROPERTY_NONE ,MID_URL_CLIENTMAP },
@@ -978,7 +978,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetTextPortionExtensio
{OUString(UNO_NAME_CONTROL_CHARACTER), FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD },
{OUString(UNO_NAME_IS_COLLAPSED), FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
{OUString(UNO_NAME_IS_START), FN_UNO_IS_START, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
- //_REDLINE_PROPERTIES
+ //REDLINE_PROPERTIES
{OUString(UNO_NAME_TEXT_PORTION_TYPE), FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{OUString(UNO_NAME_META), FN_UNO_META, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
@@ -993,7 +993,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetFootnotePropertyMap
{
{OUString(UNO_NAME_REFERENCE_ID), 0, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
COMMON_TEXT_CONTENT_PROPERTIES
- _REDLINE_NODE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -1004,8 +1004,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePropertyMap(
{
static SfxItemPropertyMapEntry const aRedlineMap_Impl[] =
{
- _REDLINE_PROPERTIES
- _REDLINE_NODE_PROPERTIES
+ REDLINE_PROPERTIES
+ REDLINE_NODE_PROPERTIES
{OUString(UNO_NAME_REDLINE_START), 0, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::READONLY, 0},
{OUString(UNO_NAME_REDLINE_END), 0, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
@@ -1044,7 +1044,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePortionPrope
{OUString(UNO_NAME_CONTROL_CHARACTER), FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD },
{OUString(UNO_NAME_IS_COLLAPSED), FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
{OUString(UNO_NAME_IS_START), FN_UNO_IS_START, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
- _REDLINE_PROPERTIES
+ REDLINE_PROPERTIES
{OUString(UNO_NAME_TEXT_PORTION_TYPE), FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
diff --git a/sw/source/core/unocore/unomapproperties.hxx b/sw/source/core/unocore/unomapproperties.hxx
index f53ac89..1f528f0 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -25,7 +25,7 @@
#define MID_TXT_LMARGIN 11
#endif
-#define _STANDARD_FONT_PROPERTIES \
+#define STANDARD_FONT_PROPERTIES \
{ OUString(UNO_NAME_CHAR_HEIGHT), RES_CHRATR_FONTSIZE , cppu::UnoType<float>::get(), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
{ OUString(UNO_NAME_CHAR_WEIGHT), RES_CHRATR_WEIGHT , cppu::UnoType<float>::get(), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
{ OUString(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
@@ -38,7 +38,7 @@
{ OUString(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE, cppu::UnoType<css::lang::Locale>::get(), PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE }, \
{ OUString(UNO_NAME_CHAR_INTEROP_GRAB_BAG), RES_CHRATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, \
-#define _CJK_FONT_PROPERTIES \
+#define CJK_FONT_PROPERTIES \
{ OUString(UNO_NAME_CHAR_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , cppu::UnoType<float>::get(), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
{ OUString(UNO_NAME_CHAR_WEIGHT_ASIAN), RES_CHRATR_CJK_WEIGHT , cppu::UnoType<float>::get(), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
{ OUString(UNO_NAME_CHAR_FONT_NAME_ASIAN), RES_CHRATR_CJK_FONT, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
@@ -49,7 +49,7 @@
{ OUString(UNO_NAME_CHAR_POSTURE_ASIAN), RES_CHRATR_CJK_POSTURE , cppu::UnoType<css::awt::FontSlant>::get(), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
{ OUString(UNO_NAME_CHAR_LOCALE_ASIAN), RES_CHRATR_CJK_LANGUAGE , cppu::UnoType<css::lang::Locale>::get() , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
-#define _CTL_FONT_PROPERTIES \
+#define CTL_FONT_PROPERTIES \
{ OUString(UNO_NAME_CHAR_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , cppu::UnoType<float>::get(), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
{ OUString(UNO_NAME_CHAR_WEIGHT_COMPLEX), RES_CHRATR_CTL_WEIGHT , cppu::UnoType<float>::get(), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
{ OUString(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
@@ -60,11 +60,11 @@
{ OUString(UNO_NAME_CHAR_POSTURE_COMPLEX), RES_CHRATR_CTL_POSTURE , cppu::UnoType<css::awt::FontSlant>::get(), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
{ OUString(UNO_NAME_CHAR_LOCALE_COMPLEX), RES_CHRATR_CTL_LANGUAGE , cppu::UnoType<css::lang::Locale>::get() , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
-#define _REDLINE_NODE_PROPERTIES \
+#define REDLINE_NODE_PROPERTIES \
{ OUString(UNO_NAME_START_REDLINE), FN_UNO_REDLINE_NODE_START , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xff }, \
{ OUString(UNO_NAME_END_REDLINE), FN_UNO_REDLINE_NODE_END , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xff },
-#define _REDLINE_PROPERTIES \
+#define REDLINE_PROPERTIES \
{OUString(UNO_NAME_REDLINE_AUTHOR), 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
{OUString(UNO_NAME_REDLINE_DATE_TIME), 0, cppu::UnoType<css::util::DateTime>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
{OUString(UNO_NAME_REDLINE_COMMENT), 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
@@ -137,9 +137,9 @@
{ OUString(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_R_MARGIN | CONVERT_TWIPS }, \
{ OUString(UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT), RES_LR_SPACE, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, MID_FIRST_AUTO }, \
{ OUString(UNO_NAME_PARA_FIRST_LINE_INDENT), RES_LR_SPACE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT | CONVERT_TWIPS }, \
- _STANDARD_FONT_PROPERTIES \
- _CJK_FONT_PROPERTIES \
- _CTL_FONT_PROPERTIES \
+ STANDARD_FONT_PROPERTIES \
+ CJK_FONT_PROPERTIES \
+ CTL_FONT_PROPERTIES \
{ OUString(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS }, \
{ OUString(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
{ OUString(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
@@ -241,7 +241,7 @@
{ OUString(UNO_NAME_NESTED_TEXT_CONTENT), FN_UNO_NESTED_TEXT_CONTENT, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
TABSTOPS_MAP_ENTRY
-#define _BASE_INDEX_PROPERTIES_\
+#define BASE_INDEX_PROPERTIES_\
{ OUString(UNO_NAME_TITLE), WID_IDX_TITLE, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0},\
{ OUString(UNO_NAME_NAME), WID_IDX_NAME, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0},\
{ OUString(UNO_NAME_CONTENT_SECTION), WID_IDX_CONTENT_SECTION, cppu::UnoType<css::text::XTextSection>::get() , PropertyAttribute::READONLY, 0},\
@@ -329,7 +329,7 @@
ANCHOR_TYPES_PROPERTY\
{ OUString(UNO_NAME_TEXT_WRAP), FN_UNO_TEXT_WRAP, cppu::UnoType<css::text::WrapTextMode>::get(), PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE },
-#define _PROP_DIFF_FONTHEIGHT \
+#define PROP_DIFF_FONTHEIGHT \
{ OUString(UNO_NAME_CHAR_PROP_HEIGHT), RES_CHRATR_FONTSIZE , cppu::UnoType<float>::get(), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
{ OUString(UNO_NAME_CHAR_DIFF_HEIGHT), RES_CHRATR_FONTSIZE , cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
{ OUString(UNO_NAME_CHAR_PROP_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , cppu::UnoType<float>::get(), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
@@ -358,9 +358,9 @@
{ OUString(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT, cppu::UnoType<sal_Int8>::get() , PROPERTY_NONE, MID_ESC_HEIGHT},\
{ OUString(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK , cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},\
{ OUString(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},\
- _STANDARD_FONT_PROPERTIES\
- _CJK_FONT_PROPERTIES\
- _CTL_FONT_PROPERTIES\
+ STANDARD_FONT_PROPERTIES\
+ CJK_FONT_PROPERTIES\
+ CTL_FONT_PROPERTIES\
{ OUString(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE , cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_TL_STYLE},\
{ OUString(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE , cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_TL_COLOR},\
{ OUString(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE , cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_TL_HASCOLOR},\
@@ -437,7 +437,7 @@
{ OUString(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FITTOLINE },\
{ OUString(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },\
{ OUString(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_RELIEF },\
- _PROP_DIFF_FONTHEIGHT\
+ PROP_DIFF_FONTHEIGHT\
{ OUString(UNO_NAME_FOLLOW_STYLE), FN_UNO_FOLLOW_STYLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},\
{ OUString(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},\
{ OUString(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},\
commit ff6077595f6736cd6943d9f48afd2516b4d1578a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 10:39:41 2016 +0200
Avoid reserved identifier
Change-Id: I5f512c2519fa4305527a80ee34ea51a620dcdc2c
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index b2f8564..7f3785b 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -74,9 +74,9 @@
#endif
#ifdef DBG_UTIL
- #define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc );
+ #define DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc );
#else
- #define _DEBUG_REDLINE( pDoc )
+ #define DEBUG_REDLINE( pDoc )
#endif
typedef std::vector<std::shared_ptr<SfxItemSet> > SfxItemSets;
@@ -2438,7 +2438,7 @@ SwUndoTableCpyTable::~SwUndoTableCpyTable()
void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
{
SwDoc & rDoc = rContext.GetDoc();
- _DEBUG_REDLINE( &rDoc )
+ DEBUG_REDLINE( &rDoc )
SwTableNode* pTableNd = nullptr;
for (size_t n = m_pArr->size(); n; )
@@ -2579,13 +2579,13 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
{
pInsRowUndo->UndoImpl(rContext);
}
- _DEBUG_REDLINE( &rDoc )
+ DEBUG_REDLINE( &rDoc )
}
void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
{
SwDoc & rDoc = rContext.GetDoc();
- _DEBUG_REDLINE( &rDoc )
+ DEBUG_REDLINE( &rDoc )
if( pInsRowUndo )
{
@@ -2666,7 +2666,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
pEntry->nOffset = rBox.GetSttIdx() - pEntry->nBoxIdx;
}
- _DEBUG_REDLINE( &rDoc )
+ DEBUG_REDLINE( &rDoc )
}
void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent )
@@ -2678,7 +2678,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent
m_pArr->push_back(std::unique_ptr<_UndoTableCpyTable_Entry>(pEntry));
SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
- _DEBUG_REDLINE( pDoc )
+ DEBUG_REDLINE( pDoc )
if( bDelContent )
{
SwNodeIndex aInsIdx( *rBox.GetSttNd(), 1 );
@@ -2698,7 +2698,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent
delete pEntry->pBoxNumAttr;
pEntry->pBoxNumAttr = nullptr;
}
- _DEBUG_REDLINE( pDoc )
+ DEBUG_REDLINE( pDoc )
}
void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, bool bDelContent )
@@ -2709,7 +2709,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex
if( bDelContent )
{
SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
- _DEBUG_REDLINE( pDoc )
+ DEBUG_REDLINE( pDoc )
if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
{
@@ -2718,7 +2718,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex
}
SwNodeIndex aDelIdx( *rBox.GetSttNd(), 1 );
rBox.GetFrameFormat()->GetDoc()->GetNodes().Delete( aDelIdx );
- _DEBUG_REDLINE( pDoc )
+ DEBUG_REDLINE( pDoc )
}
pEntry->nOffset = rBox.GetSttIdx() - pEntry->nBoxIdx;
commit f01f41970bd67d47161c2a2d569c883b585a273b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 10:33:49 2016 +0200
Avoid reserved identifiers
Change-Id: Ibae35afb647622707b1104cd6e938692951d566e
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 4c3d9fd..5fb77d1 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star;
#ifdef DBG_UTIL
- #define _ERROR_PREFIX "redline table corrupted: "
+ #define ERROR_PREFIX "redline table corrupted: "
namespace
{
@@ -80,7 +80,7 @@ using namespace com::sun::star;
// check for empty redlines
OSL_ENSURE( ( *(rTable[j]->GetPoint()) != *(rTable[j]->GetMark()) ) ||
( rTable[j]->GetContentIdx() != nullptr ),
- _ERROR_PREFIX "empty redline" );
+ ERROR_PREFIX "empty redline" );
}
// verify proper redline sorting
@@ -91,22 +91,22 @@ using namespace com::sun::star;
// check redline sorting
SAL_WARN_IF( *pPrev->Start() > *pCurrent->Start(), "sw",
- _ERROR_PREFIX "not sorted correctly" );
+ ERROR_PREFIX "not sorted correctly" );
// check for overlapping redlines
SAL_WARN_IF( *pPrev->End() > *pCurrent->Start(), "sw",
- _ERROR_PREFIX "overlapping redlines" );
+ ERROR_PREFIX "overlapping redlines" );
}
assert(std::is_sorted(rTable.begin(), rTable.end(), CompareSwRedlineTable()));
}
}
- #define _CHECK_REDLINE( pDoc ) lcl_CheckRedline( pDoc );
+ #define CHECK_REDLINE( pDoc ) lcl_CheckRedline( pDoc );
#else
- #define _CHECK_REDLINE( pDoc )
+ #define CHECK_REDLINE( pDoc )
#endif
@@ -622,7 +622,7 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
}
CheckAnchoredFlyConsistency(m_rDoc);
- _CHECK_REDLINE( *this )
+ CHECK_REDLINE( *this )
if (pFnc)
{
@@ -636,7 +636,7 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
}
CheckAnchoredFlyConsistency(m_rDoc);
- _CHECK_REDLINE( *this )
+ CHECK_REDLINE( *this )
m_rDoc.SetInXMLImport( bSaveInXMLImportFlag );
}
meRedlineMode = eMode;
@@ -733,7 +733,7 @@ Behaviour of Delete-Redline:
bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCallDelete )
{
bool bMerged = false;
- _CHECK_REDLINE( *this )
+ CHECK_REDLINE( *this )
if (IsRedlineOn() && !IsShowOriginal(meRedlineMode))
{
@@ -1679,7 +1679,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
delete pNewRedl;
pNewRedl = nullptr;
}
- _CHECK_REDLINE( *this )
+ CHECK_REDLINE( *this )
return ( nullptr != pNewRedl ) || bMerged;
}
@@ -1691,7 +1691,7 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl,
// #TODO - equivalent for 'SwTableRowRedline'
bool bMerged = false;
/*
- _CHECK_REDLINE( this )
+ CHECK_REDLINE( this )
*/
if (IsRedlineOn() && !IsShowOriginal(meRedlineMode))
@@ -1723,7 +1723,7 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl,
}
// #TODO - equivalent for 'SwTableRowRedline'
/*
- _CHECK_REDLINE( this )
+ CHECK_REDLINE( this )
*/
return ( nullptr != pNewRedl ) || bMerged;
@@ -1736,7 +1736,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed
// #TODO - equivalent for 'SwTableCellRedline'
bool bMerged = false;
/*
- _CHECK_REDLINE( this )
+ CHECK_REDLINE( this )
*/
if (IsRedlineOn() && !IsShowOriginal(meRedlineMode))
@@ -1768,7 +1768,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed
}
// #TODO - equivalent for 'SwTableCellRedline'
/*
- _CHECK_REDLINE( this )
+ CHECK_REDLINE( this )
*/
return ( nullptr != pNewRedl ) || bMerged;
@@ -1776,7 +1776,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed
void DocumentRedlineManager::CompressRedlines()
{
- _CHECK_REDLINE( *this )
+ CHECK_REDLINE( *this )
void (SwRangeRedline::*pFnc)(sal_uInt16, size_t) = nullptr;
switch( nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode )
@@ -1817,7 +1817,7 @@ void DocumentRedlineManager::CompressRedlines()
(pPrev->*pFnc)(0, nPrevIndex);
}
}
- _CHECK_REDLINE( *this )
+ CHECK_REDLINE( *this )
// #TODO - add 'SwExtraRedlineTable' also ?
}
commit 57aaf3022239699939c37bab9a4ec65a9a6d7fb7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 10:13:45 2016 +0200
Avoid reserved identifier
Change-Id: Ie3e28611003ae51ba4d0278cec41744f2ca08223
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 62396a5..41205a3 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -30,7 +30,7 @@ class SwSectionNode;
// Everywhere where NodeIndex is used, the header files missing here
// are already included. Therefore put here as defines only and
// not as inline methods (saves compile time).
-#define _SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
+#define SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
struct CompareSwFootnoteIdxs
{
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 5bec265..23a886b 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -417,7 +417,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
bool bTypeChgd = false;
const size_t nPosSave = nPos;
while( nPos < rFootnoteArr.size() &&
- (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ nPos++ ] )))
+ (( nIdx = SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ nPos++ ] )))
< nEndNd || ( nIdx == nEndNd &&
nEndCnt >= pTextFootnote->GetStart() )) )
if( nIdx > nSttNd || ( nIdx == nSttNd &&
@@ -447,7 +447,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
nPos = nPosSave; // There are more in the front!
while( nPos &&
- (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ --nPos ] )))
+ (( nIdx = SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ --nPos ] )))
> nSttNd || ( nIdx == nSttNd &&
nSttCnt <= pTextFootnote->GetStart() )) )
if( nIdx < nEndNd || ( nIdx == nEndNd &&
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 4731017..d9bfbc2 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -31,8 +31,8 @@
bool CompareSwFootnoteIdxs::operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const
{
- sal_uLong nIdxLHS = _SwTextFootnote_GetIndex( lhs );
- sal_uLong nIdxRHS = _SwTextFootnote_GetIndex( rhs );
+ sal_uLong nIdxLHS = SwTextFootnote_GetIndex( lhs );
+ sal_uLong nIdxRHS = SwTextFootnote_GetIndex( rhs );
return ( nIdxLHS == nIdxRHS && lhs->GetStart() < rhs->GetStart() ) || nIdxLHS < nIdxRHS;
}
@@ -256,7 +256,7 @@ SwTextFootnote* SwFootnoteIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFnd
while( nU <= nO )
{
const size_t nM = nU + ( nO - nU ) / 2;
- sal_uLong nNdIdx = _SwTextFootnote_GetIndex( (*this)[ nM ] );
+ sal_uLong nNdIdx = SwTextFootnote_GetIndex( (*this)[ nM ] );
if( nNdIdx == nIdx )
{
if( pFndPos )
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index b65f244..8ad3ab1 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -758,7 +758,7 @@ void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
// Delete all succeeding Footnotes
while( nPos < rFootnoteArr.size() &&
- _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) <= nEnd )
+ SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) <= nEnd )
{
// If the Nodes are not deleted, they need to deregister at the Pages
// (delete Frames) or else they will remain there (Undo does not delete them!)
@@ -767,7 +767,7 @@ void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
}
while( nPos-- &&
- _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) >= nStt )
+ SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) >= nStt )
{
// If the Nodes are not deleted, they need to deregister at the Pages
// (delete Frames) or else they will remain there (Undo does not delete them!)
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index e340e02..effa11a 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -439,7 +439,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_u
SwHistorySetFootnote::SwHistorySetFootnote( const SwTextFootnote &rTextFootnote )
: SwHistoryHint( HSTRY_SETFTNHNT )
, m_FootnoteNumber( rTextFootnote.GetFootnote().GetNumStr() )
- , m_nNodeIndex( _SwTextFootnote_GetIndex( (&rTextFootnote) ) )
+ , m_nNodeIndex( SwTextFootnote_GetIndex( (&rTextFootnote) ) )
, m_nStart( rTextFootnote.GetStart() )
, m_bEndNote( rTextFootnote.GetFootnote().IsEndNote() )
{
commit 1c2c47ca580eeb6b825c0ea8d929967a49a51bec
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 09:54:17 2016 +0200
Avoid reserved identifier
Change-Id: I3b1505e788af009a0ff4bb2502883de5bfb45617
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index c02ae6a..1bf337f 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -85,14 +85,14 @@ public:
};
-#define __nSize 2048
+#define nSize_ 2048
class FormCache
{
private:
- FormIdent aIdents[ __nSize ]; //gepufferte Formate
- sal_Bool bValid[ __nSize ];
+ FormIdent aIdents[ nSize_ ]; //gepufferte Formate
+ sal_Bool bValid[ nSize_ ];
FormIdent aCompareIdent; // zum Vergleichen
sal_uInt8 nDefaultFormat; // Defaultformat der Datei
SvNumberFormatter* pFormTable; // Value-Format-Table-Anker
@@ -118,7 +118,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt
aCompareIdent.SetStamp( nFormat, nSt );
nIndex = aCompareIdent.GetStamp();
- OSL_ENSURE( nIndex < __nSize, "FormCache::GetAttr(): Oups... not this way!" );
+ OSL_ENSURE( nIndex < nSize_, "FormCache::GetAttr(): Oups... not this way!" );
if( bValid[ nIndex ] )
pRet = aIdents[ nIndex ].GetAttr();
else
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index d6c74493..8deb70b 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -152,14 +152,14 @@ FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat )
{ // Default format is 'Default'
nDefaultFormat = nNewDefaultFormat;
pFormTable = pDoc1->GetFormatTable();
- for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ )
+ for( sal_uInt16 nC = 0 ; nC < nSize_ ; nC++ )
bValid[ nC ] = false;
eLanguage = ScGlobal::eLnge;
}
FormCache::~FormCache()
{
- for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ )
+ for( sal_uInt16 nC = 0 ; nC < nSize_ ; nC++ )
delete aIdents[ nC ].GetAttr();
}
commit 682ffda0902c56f6d2ac06fada618d51216091c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 09:36:33 2016 +0200
Avoid reserved identifier
Change-Id: If9c507146855fa23df576d038e9b2f0e3d69ac20
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 929c240..bf77414 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -66,7 +66,7 @@
#include <math.h>
#include <memory>
-#define _D_MAX_LONG_ (double) 0x7fffffff
+#define D_MAX_LONG_ (double) 0x7fffffff
extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
@@ -1671,7 +1671,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bError = true;
break;
case FILL_DATE:
- if (fabs(nVal) > _D_MAX_LONG_)
+ if (fabs(nVal) > D_MAX_LONG_)
bError = true;
else
IncDate(nVal, nDayOfMonth, nStepValue, eFillDateCmd);
commit 623f6d1c72e328fdc7e2c168edecf39a5d269e4a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 08:16:52 2016 +0200
Remove unconditionally enabled _SVG_WRITE_EXTENTS flag
Change-Id: I0bcf1e4929c4bdc0781637dfe95a8a7b47554430
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index c2a5354..47f5a1d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -764,11 +764,9 @@ bool SVGFilter::implExportDocument()
if( mpSVGExport->IsUseTinyProfile() )
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "baseProfile", "tiny" );
- // enabling _SVG_WRITE_EXTENTS means that the slide size is not adapted
+ // The following if block means that the slide size is not adapted
// to the size of the browser window, moreover the slide is top left aligned
- // instead of centered.
- #define _SVG_WRITE_EXTENTS
- #ifdef _SVG_WRITE_EXTENTS
+ // instead of centered:
if( !mbPresentation )
{
aAttr = OUString::number( nDocWidth * 0.01 ) + "mm";
@@ -777,7 +775,6 @@ bool SVGFilter::implExportDocument()
aAttr = OUString::number( nDocHeight * 0.01 ) + "mm";
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
}
- #endif
// #i124608# set viewBox explicitely to the exported content
if (mbExportShapeSelection)
commit 2d42a1bcf6f602aed5a6c7d2b8634a62b9513f87
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 08:13:18 2016 +0200
Avoid reserved identifiers
Change-Id: I175de0aa53559fb092644d18e05e2d890fe05fca
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index 183b4d9..57c69ad 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -123,7 +123,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
if (!aT1.equals(aT2))
{
- _FILTER_CONFIG_LOG_("isSubSet() ... types of any values are different => return FALSE\n")
+ FILTER_CONFIG_LOG_("isSubSet() ... types of any values are different => return FALSE\n")
return false;
}
@@ -143,7 +143,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
case css::uno::TypeClass_DOUBLE :
{
bool bIs = (aSubSet == aSet);
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for atomic types => return %s\n", bIs ? "TRUE" : "FALSE")
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for atomic types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -159,7 +159,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
)
{
bool bIs = (v1.equals(v2));
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for string types => return %s\n", bIs ? "TRUE" : "FALSE")
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for string types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
}
@@ -177,7 +177,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
)
{
bool bIs = (isSubSet(v1, v2));
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for packed any types => return %s\n", bIs ? "TRUE" : "FALSE")
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for packed any types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
}
@@ -198,7 +198,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
(p1.Name.equals(p2.Name) ) &&
(isSubSet(p1.Value, p2.Value))
);
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [PropertyValue] => return %s\n", bIs ? "TRUE" : "FALSE")
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [PropertyValue] => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -214,7 +214,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
(n1.Name.equals(n2.Name) ) &&
(isSubSet(n1.Value, n2.Value))
);
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [NamedValue] => return %s\n", bIs ? "TRUE" : "FALSE")
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [NamedValue] => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
}
@@ -240,12 +240,12 @@ bool isSubSet(const css::uno::Any& aSubSet,
{
if (::std::find(stl_s2.begin(), stl_s2.end(), *it1) == stl_s2.end())
{
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(*it1))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(*it1))
return false;
}
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... found \"%s\" => continue loop\n", _FILTER_CONFIG_TO_ASCII_(*it1))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... found \"%s\" => continue loop\n", _FILTER_CONFIG_TO_ASCII_(*it1))
}
- _FILTER_CONFIG_LOG_("isSubSet() ... check for list types [OUString] => return TRUE\n")
+ FILTER_CONFIG_LOG_("isSubSet() ... check for list types [OUString] => return TRUE\n")
return true;
}
@@ -267,17 +267,17 @@ bool isSubSet(const css::uno::Any& aSubSet,
::comphelper::SequenceAsHashMap::const_iterator it2 = stl_p2.find(it1->first);
if (it2 == stl_p2.end())
{
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
return false;
}
if (!isSubSet(it1->second, it2->second))
{
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
return false;
}
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
}
- _FILTER_CONFIG_LOG_("isSubSet() ... check for list types [PropertyValue] => return TRUE\n")
+ FILTER_CONFIG_LOG_("isSubSet() ... check for list types [PropertyValue] => return TRUE\n")
return true;
}
@@ -299,17 +299,17 @@ bool isSubSet(const css::uno::Any& aSubSet,
::comphelper::SequenceAsHashMap::const_iterator it2 = stl_n2.find(it1->first);
if (it2 == stl_n2.end())
{
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
return false;
}
if (!isSubSet(it1->second, it2->second))
{
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
return false;
}
- _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
+ FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
}
- _FILTER_CONFIG_LOG_("isSubSet() ... check for list types [NamedValue] => return TRUE\n")
+ FILTER_CONFIG_LOG_("isSubSet() ... check for list types [NamedValue] => return TRUE\n")
return true;
}
}
@@ -332,14 +332,14 @@ bool CacheItem::haveProps(const CacheItem& lProps) const
const_iterator pItThis = this->find(pIt->first);
if (pItThis == this->end())
{
- _FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
+ FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
return false;
}
// ii) one item does not have the right value => return false
if (!isSubSet(pIt->second, pItThis->second))
{
- _FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... item \"%s\" has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
+ FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... item \"%s\" has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
return false;
}
}
@@ -347,7 +347,7 @@ bool CacheItem::haveProps(const CacheItem& lProps) const
// this method was not breaked before =>
// the given property set seems to match with our
// own properties in its minimum => return TRUE
- _FILTER_CONFIG_LOG_("CacheItem::haveProps() ... => return TRUE\n")
+ FILTER_CONFIG_LOG_("CacheItem::haveProps() ... => return TRUE\n")
return true;
}
@@ -365,7 +365,7 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const
const_iterator pItThis = this->find(pIt->first);
if (pItThis == this->end())
{
- _FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... not found \"%s\" => continue loop!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
+ FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... not found \"%s\" => continue loop!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
continue;
}
@@ -374,7 +374,7 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const
// But we checked for "don't have it" here.
if (isSubSet(pIt->second, pItThis->second))
{
- _FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... item \"%s\" has same value => return FALSE!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
+ FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... item \"%s\" has same value => return FALSE!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
return false;
}
}
@@ -382,7 +382,7 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const
// this method was not breaked before =>
// That means: this item has no matching property
// of the given set. It "don't have" it ... => return true.
- _FILTER_CONFIG_LOG_("CacheItem::dontHaveProps() ... => return TRUE\n")
+ FILTER_CONFIG_LOG_("CacheItem::dontHaveProps() ... => return TRUE\n")
return true;
}
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 1afda54..fd4d9e0 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -68,7 +68,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
OUString sRealHandler = sHandler;
- #ifdef _FILTER_CONFIG_MIGRATION_Q_
+ #ifdef FILTER_CONFIG_MIGRATION_Q_
/* -> TODO - HACK
check if the given handler name really exists ...
@@ -80,7 +80,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
if (!cache.hasItem(FilterCache::E_CONTENTHANDLER, sHandler) && cache.hasItem(FilterCache::E_TYPE, sHandler))
{
- _FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
+ FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
css::uno::Sequence< OUString > lTypes { sHandler };
@@ -102,7 +102,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
/* <- HACK */
- #endif // _FILTER_CONFIG_MIGRATION_Q_
+ #endif // FILTER_CONFIG_MIGRATION_Q_
// search handler on cache
CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sRealHandler);
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index ac3b91f..7a6323e 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -222,7 +222,7 @@ void FilterCache::load(EFillState eRequired)
impl_getDirectCFGValue(CFGDIRECTKEY_OFFICELOCALE) >>= m_sActLocale;
if (m_sActLocale.isEmpty())
{
- _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify office locale => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_OFFICELOCALE));
+ FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify office locale => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_OFFICELOCALE));
m_sActLocale = DEFAULT_OFFICELOCALE;
}
@@ -270,8 +270,8 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType ,
pIt != rList.end() ;
++pIt )
{
- _FILTER_CONFIG_LOG_1_("getMatchingProps for \"%s\" ...\n",
- _FILTER_CONFIG_TO_ASCII_(pIt->first))
+ FILTER_CONFIG_LOG_1_("getMatchingProps for \"%s\" ...\n",
+ FILTER_CONFIG_TO_ASCII_(pIt->first))
if (
(pIt->second.haveProps(lIProps) ) &&
(pIt->second.dontHaveProps(lEProps))
@@ -1560,7 +1560,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
OUString sMsg("Fallback scenario for filter or type '" + sName + "' and locale '" +
sActLocale + "' failed. Please check your filter configuration.");
- OSL_FAIL(_FILTER_CONFIG_TO_ASCII_(sMsg));
+ OSL_FAIL(FILTER_CONFIG_TO_ASCII_(sMsg));
#endif
return;
}
@@ -1766,7 +1766,7 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType
if (bItemInConfig)
{
(*pList)[sItem] = impl_loadItem(xSet, eType, sItem, E_READ_ALL);
- _FILTER_CONFIG_LOG_2_("impl_loadItemOnDemand(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(sItem).getStr())
+ FILTER_CONFIG_LOG_2_("impl_loadItemOnDemand(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(sItem).getStr())
}
else
{
@@ -2081,7 +2081,7 @@ void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue,
if (nOrder > 0)
{
SAL_WARN( "filter.config", "FilterCache::impl_interpretDataVal4Filter()\nCan not move Order value from filter to type on demand!");
- _FILTER_CONFIG_LOG_2_("impl_interpretDataVal4Filter(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(rItem).getStr())
+ FILTER_CONFIG_LOG_2_("impl_interpretDataVal4Filter(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(rItem).getStr())
}
}
break;
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 4381264..079bd64 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -84,7 +84,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
OUString sRealFilter = sFilter;
- #ifdef _FILTER_CONFIG_MIGRATION_Q_
+ #ifdef FILTER_CONFIG_MIGRATION_Q_
/* -> TODO - HACK
check if the given filter name really exist ...
@@ -97,7 +97,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
if (!cache.hasItem(FilterCache::E_FILTER, sFilter) && cache.hasItem(FilterCache::E_TYPE, sFilter))
{
OSL_FAIL("Who use this deprecated functionality?");
- _FILTER_CONFIG_LOG_("FilterFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
+ FILTER_CONFIG_LOG_("FilterFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
css::uno::Sequence< css::beans::NamedValue > lQuery { { PROPNAME_TYPE, css::uno::makeAny(sFilter) } };
@@ -117,7 +117,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
/* <- HACK */
- #endif // _FILTER_CONFIG_MIGRATION_Q_
+ #endif // FILTER_CONFIG_MIGRATION_Q_
// search filter on cache
CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sRealFilter);
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 0baf601..09d545a 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -65,7 +65,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
OUString sRealLoader = sLoader;
- #ifdef _FILTER_CONFIG_MIGRATION_Q_
+ #ifdef FILTER_CONFIG_MIGRATION_Q_
/* -> TODO - HACK
check if the given loader name really exist ...
@@ -77,7 +77,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
if (!cache.hasItem(FilterCache::E_FRAMELOADER, sLoader) && cache.hasItem(FilterCache::E_TYPE, sLoader))
{
- _FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
+ FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
css::uno::Sequence< OUString > lTypes { sLoader };
@@ -99,7 +99,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
/* <- HACK */
- #endif // _FILTER_CONFIG_MIGRATION_Q_
+ #endif // FILTER_CONFIG_MIGRATION_Q_
// search loader on cache
CacheItem aLoader = cache.getItem(m_eType, sRealLoader);
diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx
index 9534c33..5450f50 100644
--- a/filter/source/config/cache/macros.hxx
+++ b/filter/source/config/cache/macros.hxx
@@ -22,16 +22,16 @@
#include <rtl/ustring.hxx>
-#ifdef _FILTER_CONFIG_TO_ASCII_
+#ifdef FILTER_CONFIG_TO_ASCII_
#error "who already defined such macro :-("
#endif
-#define _FILTER_CONFIG_TO_ASCII_(UNICODE_STRING) \
+#define FILTER_CONFIG_TO_ASCII_(UNICODE_STRING) \
OUStringToOString(UNICODE_STRING, RTL_TEXTENCODING_UTF8).getStr()
-#define _FILTER_CONFIG_LOG_(TEXT)
-#define _FILTER_CONFIG_LOG_1_(FORMAT, ARG1)
-#define _FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2)
+#define FILTER_CONFIG_LOG_(TEXT)
+#define FILTER_CONFIG_LOG_1_(FORMAT, ARG1)
+#define FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2)
#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX
diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx
index d672833..6c3fe13 100644
--- a/filter/source/config/cache/versions.hxx
+++ b/filter/source/config/cache/versions.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX
-#define _FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-)
+#define FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-)
#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX
commit 703d4020d4df0deabcbd40b9b3e4aa038ba68f0b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 11 23:54:16 2016 +0200
Avoid reserved identifier
Change-Id: I443d7d82de72841b1ac1f2ed026c647e3f1957fc
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx
index d7ea30e..dd05c4c 100644
--- a/dbaccess/source/shared/dbu_reghelper.cxx
+++ b/dbaccess/source/shared/dbu_reghelper.cxx
@@ -26,9 +26,9 @@
namespace dbaui
{
- #define _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #define REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
#include "registrationhelper.cxx"
- #undef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #undef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
}
diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx
index 022c62c..ca60a1c 100644
--- a/dbaccess/source/shared/flt_reghelper.cxx
+++ b/dbaccess/source/shared/flt_reghelper.cxx
@@ -26,9 +26,9 @@
namespace dbaxml
{
- #define _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #define REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
#include "registrationhelper.cxx"
- #undef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #undef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
}
diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx
index bac0be8..490962e 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -19,7 +19,7 @@
// be included in other cxx files
-#ifndef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+#ifndef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
#error "don't build this file directly! use dbu_reghelper.cxx instead!"
#endif
commit 374b06c7d2d46bc58896360f957df599ccc1d13e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 11 23:52:19 2016 +0200
Avoid reserved identifier
Change-Id: I5e6938385ce870579982f21ad824081f4cc1ef60
diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx
index 6db0308..746b1da 100644
--- a/dbaccess/source/inc/dbu_reghelper.hxx
+++ b/dbaccess/source/inc/dbu_reghelper.hxx
@@ -29,9 +29,9 @@
namespace dbaui
{
- #define _REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
+ #define REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
#include "registrationhelper.hxx"
- #undef _REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
+ #undef REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
}
diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx
index 8bad3f6..3760fe3 100644
--- a/dbaccess/source/inc/flt_reghelper.hxx
+++ b/dbaccess/source/inc/flt_reghelper.hxx
@@ -29,9 +29,9 @@
namespace dbaxml
{
- #define _REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
+ #define REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
#include "registrationhelper.hxx"
- #undef _REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
+ #undef REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
}
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index b49b40f..fea7e3c 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
+#ifndef REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
#error "don't include this file directly! use dbu_reghelper.hxx instead!"
#endif
commit 8274655443eaf20ad10500ce3dc57349912181c8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 11 23:31:33 2016 +0200
Remove empty scriptdlg.hrc
Change-Id: I4a4bf1aa1d6afe819c22288474be302fe95740d1
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 01dbaaa..52eb491 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -27,7 +27,6 @@
#include <osl/mutex.hxx>
#include <cuires.hrc>
-#include "scriptdlg.hrc"
#include "scriptdlg.hxx"
#include <dialmgr.hxx>
#include "selector.hxx"
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
deleted file mode 100644
index e79e2f0..0000000
--- a/cui/source/dialogs/scriptdlg.hrc
+++ /dev/null
@@ -1,26 +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 .
- */
-
-#ifndef _SCRIPTDLG_HRC
-#define _SCRIPTDLG_HRC
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index b2ea470..380a485 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -18,7 +18,6 @@
*/
#include <cuires.hrc>
-#include "scriptdlg.hrc"
#include "helpid.hrc"
String RID_SVXSTR_DELQUERY
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index 459e36f..805432f 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -221,7 +221,7 @@ ${MYCMD} --base sysui/desktop/share --files documents.ulf launcher_comment.ulf l
#${MYCMD} --base cui/source/customize --files acccfg.hrc cfg.hrc
-#${MYCMD} --base cui/source/dialogs --files fmsearch.hrc scriptdlg.hrc svuidlg.hrc
+#${MYCMD} --base cui/source/dialogs --files fmsearch.hrc svuidlg.hrc
#${MYCMD} --base cui/source/inc --files cuires.hrc gallery.hrc helpid.hrc
commit 58ecaf1f470d92db95a5f02adf3b5e4147442a57
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 11 23:04:35 2016 +0200
Get rid of _SVX_NOIDERESIDS
Change-Id: Iab728d51c24ccbedad5fa181850a673129d489ae
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index d90497e..9082001 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -17,14 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BASIDESH_HRC
-#define _BASIDESH_HRC
+#ifndef BASCTL_INC_BASIDESH_HRC
+#define BASCTL_INC_BASIDESH_HRC
#include <svx/svxids.hrc>
-// Resource-ID's...
-#ifndef _SVX_NOIDERESIDS
-
#define RID_BASICIDE_OBJECTBAR ( RID_BASICIDE_START + 0 )
#define RID_EDT_WATCHEDIT ( RID_BASICIDE_START + 4 )
#define RID_POPUP_BRKDLG ( RID_BASICIDE_START + 10 )
@@ -149,8 +146,6 @@
#define RID_FT_LINE ( RID_BASICIDE_START + 123 )
#define RID_ED_LINE ( RID_BASICIDE_START + 124 )
-#endif // _SVX_NOIDERESIDS
-
-#endif // _BASIDESH_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index f028bcf..37c863b 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -17,12 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
-#define _SVX_NOIDERESIDS
#include "breakpoint.hxx"
#include "brkdlg.hxx"
#include "basidesh.hxx"
-#include "basidesh.hrc"
#include <sfx2/dispatch.hxx>
commit 9a80171db18d7c8988dfd7598e8af17c6b2e02de
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 11 22:31:50 2016 +0200
Avoid reserved identifiers
Change-Id: I6c8565653ece37251a98103f71408ace2a0946a8
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cf6ce7a..b15cbd0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4342,7 +4342,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
sal_uInt32 nExtra, nAtomSize = 0;
sal_uInt32 nInstance, nUncompressedSize = p_EscherBlibEntry->mnSize;
- if ( mnFlags & _E_GRAPH_PROV_USE_INSTANCES )
+ if ( mnFlags & E_GRAPH_PROV_USE_INSTANCES )
{
rPicOutStrm.WriteUInt32( 0x7f90000 | (sal_uInt16)( mnBlibEntrys << 4 ) )
.WriteUInt32( 0 );
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 9648f66..db70cc8 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -655,8 +655,8 @@ public:
};
-#define _E_GRAPH_PROV_USE_INSTANCES 1
-#define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2
+#define E_GRAPH_PROV_USE_INSTANCES 1
+#define E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2
class MSFILTER_DLLPUBLIC EscherGraphicProvider
{
@@ -695,7 +695,7 @@ public:
void SetBaseURI( const OUString& rBaseURI ) { maBaseURI = rBaseURI; };
const OUString& GetBaseURI() { return maBaseURI; };
- EscherGraphicProvider( sal_uInt32 nFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
+ EscherGraphicProvider( sal_uInt32 nFlags = E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
virtual ~EscherGraphicProvider();
};
@@ -1053,7 +1053,7 @@ public:
class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider
{
public:
- explicit EscherExGlobal( sal_uInt32 nGraphicProvFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
+ explicit EscherExGlobal( sal_uInt32 nGraphicProvFlags = E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
virtual ~EscherExGlobal();
/** Returns a new drawing ID for a new drawing container (DGCONTAINER). */
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 39a8ebf8..cc1e467 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -97,7 +97,7 @@ using namespace ::com::sun::star;
PPTExBulletProvider::PPTExBulletProvider()
{
- pGraphicProv = new EscherGraphicProvider( _E_GRAPH_PROV_USE_INSTANCES | _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
+ pGraphicProv = new EscherGraphicProvider( E_GRAPH_PROV_USE_INSTANCES | E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
}
PPTExBulletProvider::~PPTExBulletProvider()
commit 3a09d852db28245633d06d0c79744a7780b19f1a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 11 21:24:11 2016 +0200
Avoid reserved identifiers
Change-Id: Ie832e82ca3767114457780581444f6fc8aa9fdd2
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index b688140..a154be8 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1609,10 +1609,10 @@ void X11SalFrame::SetAlwaysOnTop( bool bOnTop )
}
}
-#define _FRAMESTATE_MASK_GEOMETRY \
+#define FRAMESTATE_MASK_GEOMETRY \
(WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | \
WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT)
-#define _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY \
+#define FRAMESTATE_MASK_MAXIMIZED_GEOMETRY \
(WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | \
WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT)
@@ -1622,7 +1622,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
return;
// Request for position or size change
- if (pState->mnMask & _FRAMESTATE_MASK_GEOMETRY)
+ if (pState->mnMask & FRAMESTATE_MASK_GEOMETRY)
{
Rectangle aPosSize;
@@ -1633,8 +1633,8 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
if( ! IsChildWindow() &&
(pState->mnMask & WINDOWSTATE_MASK_STATE) &&
(pState->mnState & WINDOWSTATE_STATE_MAXIMIZED) &&
- (pState->mnMask & _FRAMESTATE_MASK_GEOMETRY) == _FRAMESTATE_MASK_GEOMETRY &&
- (pState->mnMask & _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY) == _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY
+ (pState->mnMask & FRAMESTATE_MASK_GEOMETRY) == FRAMESTATE_MASK_GEOMETRY &&
+ (pState->mnMask & FRAMESTATE_MASK_MAXIMIZED_GEOMETRY) == FRAMESTATE_MASK_MAXIMIZED_GEOMETRY
)
{
XSizeHints* pHints = XAllocSizeHints();
@@ -1666,7 +1666,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
{
bool bDoAdjust = false;
// initialize with current geometry
- if ((pState->mnMask & _FRAMESTATE_MASK_GEOMETRY) != _FRAMESTATE_MASK_GEOMETRY)
+ if ((pState->mnMask & FRAMESTATE_MASK_GEOMETRY) != FRAMESTATE_MASK_GEOMETRY)
GetPosSize (aPosSize);
// change requested properties
@@ -1792,7 +1792,7 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState )
pState->mnWidth = aPosSize.GetWidth();
pState->mnHeight = aPosSize.GetHeight();
- pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE;
+ pState->mnMask = FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list