[Libreoffice-commits] core.git: 3 commits - sw/source sysui/desktop
Tor Lillqvist
tml at collabora.com
Wed Oct 23 09:11:43 PDT 2013
sw/source/filter/ww8/ww8atr.cxx | 101 +++++++++++++++++++------------------
sysui/desktop/macosx/Info.plist.in | 2
2 files changed, 53 insertions(+), 50 deletions(-)
New commits:
commit 5486fd99e185833f1defa9681ef48f50940a65db
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 23 19:10:47 2013 +0300
Fix syntax error in the LSMinimumSystemVersion value
Change-Id: I462a4608e93647e04e591628459e09d3661aec4d
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index 9602a25..16f9eae 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1423,7 +1423,7 @@
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>
- <string>@MACOSX_DEPLOYMENT_TARGET at .0<string>
+ <string>@MACOSX_DEPLOYMENT_TARGET at .0</string>
</dict>
</plist>
commit 56a9582981d3cae0b74fc0c75b2aa94ca3cae26c
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 23 19:05:28 2013 +0300
Fix indentation
Change-Id: I8471214bb2d65d46f2123feb8ff33bf46bbba1d7
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 40214b9..a068f77 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2241,65 +2241,67 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
}
}
}
- {
- OUString aFillTxt;
- sal_uInt8 nNoPgStt = MAXLEVEL, nNoPgEnd = MAXLEVEL;
- bool bFirstFillTxt = true, bOnlyText = true;
- for( n = 0; n < nTOXLvl; ++n )
- {
- OUString aTxt;
- int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(),
- static_cast< sal_uInt8 >(n+1), aTxt );
- if( 1 == nRet )
- {
- bOnlyText = false;
- if( MAXLEVEL == nNoPgStt )
- nNoPgStt = static_cast< sal_uInt8 >(n+1);
- }
- else
- {
- if( MAXLEVEL != nNoPgStt &&
- MAXLEVEL == nNoPgEnd )
- nNoPgEnd = sal_uInt8(n);
- bOnlyText = bOnlyText && 3 == nRet;
- if( 3 == nRet || 4 == nRet )
- {
- if( bFirstFillTxt )
- aFillTxt = aTxt;
- else if( aFillTxt != aTxt )
- aFillTxt = "";
- bFirstFillTxt = false;
- }
- }
- }
- if( MAXLEVEL != nNoPgStt )
+ // No 'else' branch; why the below snippet is a block I have no idea.
+ {
+ OUString aFillTxt;
+ sal_uInt8 nNoPgStt = MAXLEVEL, nNoPgEnd = MAXLEVEL;
+ bool bFirstFillTxt = true, bOnlyText = true;
+ for( n = 0; n < nTOXLvl; ++n )
+ {
+ OUString aTxt;
+ int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(),
+ static_cast< sal_uInt8 >(n+1), aTxt );
+ if( 1 == nRet )
{
- if (WW8ListManager::nMaxLevel < nNoPgEnd)
- nNoPgEnd = WW8ListManager::nMaxLevel;
- sStr += "\\n ";
- sStr += OUString::number( nNoPgStt );
- sStr += "-";
- sStr += OUString::number( nNoPgEnd );
- sStr += " ";
+ bOnlyText = false;
+ if( MAXLEVEL == nNoPgStt )
+ nNoPgStt = static_cast< sal_uInt8 >(n+1);
}
- if( bOnlyText )
+ else
{
- sStr += "\\p \"";
- sStr += aFillTxt;
- sStr += sEntryEnd;
+ if( MAXLEVEL != nNoPgStt &&
+ MAXLEVEL == nNoPgEnd )
+ nNoPgEnd = sal_uInt8(n);
+
+ bOnlyText = bOnlyText && 3 == nRet;
+ if( 3 == nRet || 4 == nRet )
+ {
+ if( bFirstFillTxt )
+ aFillTxt = aTxt;
+ else if( aFillTxt != aTxt )
+ aFillTxt = "";
+ bFirstFillTxt = false;
+ }
}
}
-
- if( !sTOption.isEmpty() )
+ if( MAXLEVEL != nNoPgStt )
+ {
+ if (WW8ListManager::nMaxLevel < nNoPgEnd)
+ nNoPgEnd = WW8ListManager::nMaxLevel;
+ sStr += "\\n ";
+ sStr += OUString::number( nNoPgStt );
+ sStr += "-";
+ sStr += OUString::number( nNoPgEnd );
+ sStr += " ";
+ }
+ if( bOnlyText )
{
- sStr += "\\t \"";
- sStr += sTOption;
+ sStr += "\\p \"";
+ sStr += aFillTxt;
sStr += sEntryEnd;
}
+ }
+
+ if( !sTOption.isEmpty() )
+ {
+ sStr += "\\t \"";
+ sStr += sTOption;
+ sStr += sEntryEnd;
+ }
- if (lcl_IsHyperlinked(pTOX->GetTOXForm(), nTOXLvl))
- sStr += "\\h";
+ if (lcl_IsHyperlinked(pTOX->GetTOXForm(), nTOXLvl))
+ sStr += "\\h";
}
break;
}
commit 8eb7d02999b7f40bc364ebcd61ebd454c04aef2b
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 23 18:57:21 2013 +0300
WaE: statement aligned as second statement in if ... [loplugin]
Full warning message: statement aligned as second statement in if body but not
in a statement block.
To make the warning go away, put braces around the if-ed statement (a for
statement). Leaves the stuff afterwards still oddly indented but will fix that
in a separate commit.
Change-Id: I875569de8aa7ff587eda0da241723c900486dd43
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 1d01bf4..40214b9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2215,6 +2215,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
}
if( nsSwTOXElement::TOX_TEMPLATE & pTOX->GetCreateType() )
+ {
// #i99641# - Consider additional styles regardless of TOX-outlinelevel
for( n = 0; n < MAXLEVEL; ++n )
{
@@ -2239,7 +2240,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
} while( -1 != nPos );
}
}
-
+ }
{
OUString aFillTxt;
sal_uInt8 nNoPgStt = MAXLEVEL, nNoPgEnd = MAXLEVEL;
More information about the Libreoffice-commits
mailing list