strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add hook to block use of markup in .ui files

Browse source 
Change-Id: Ia7eed5e9e1f8fba9876730e909461dabc167deb9
This commit is contained in:
Caolán McNamara 2012-10-26 12:57:37 +01:00
parent fe347327a4
commit d21eb6bc91
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.git-hooks/pre-commit
View file

@ -14,8 +14,8 @@ $ENV{LC_ALL} = "C";
sub check_whitespaces($)
{
my ($h) = @_;
my $src_limited = "c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml";
my $src_full = "c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml";
my $src_limited = "c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pmk|pl|pm|sdi|sh|src|tab|ui|xcu|xml";
my $src_full = "c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pmk|pl|pm|sdi|sh|src|tab|ui|xcu|xml";
my $found_bad = 0;
my $filename;
@ -80,6 +80,10 @@ sub check_whitespaces($)
{
bad_line("temporary debug in commit", $_, $src_limited);
}
if (/<property name="use_markup">True<\/property>/)
{
bad_line("use font attributes instead of use-markup", $_, $src_limited);
}
}
}
if ( $found_bad)

2
vcl/source/window/builder.cxx
View file

@ -1503,8 +1503,6 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
if (!sProperty.isEmpty())
{
sProperty = sProperty.replace('_', '-');
//https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
SAL_WARN_IF(sProperty == "use-markup", "vcl.layout", "Use pango attributes instead of mark-up");
rMap[sProperty] = sValue;
}
}

5
vcl/source/window/window2.cxx
View file

@ -2127,6 +2127,11 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
nBits |= WB_AUTOVSCROLL;
SetStyle(nBits);
}
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("use-markup")))
{
//https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
SAL_WARN_IF(toBool(rValue), "vcl.layout", "Use pango attributes instead of mark-up");
}
else
{
SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());