summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-02-25 17:52:23 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-02-25 17:59:40 +0100
commit4f4e4e40f5b79a4dba46ffedd11cafa7beb08a87 (patch)
treec158b93b176b084eac024c0e3b5e94e18911f50f /sfx2
parente39c551c6133d0ff2b7074f64ea66563ebcce14b (diff)
loplugin: improve indentation
Change-Id: Idb847766d93dc222d6c55889616da21eeac212ee
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/guisaveas.cxx22
-rw-r--r--sfx2/source/view/userinputinterception.cxx4
-rw-r--r--sfx2/source/view/viewsh.cxx9
3 files changed, 17 insertions, 18 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index e6fd041bae9f..1b40a74c800b 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1699,18 +1699,20 @@ void SfxStoringHelper::SetDocInfoState(
{
uno::Any aValue = xPropSet->getPropertyValue( pProps[i].Name );
if ( pProps[i].Attributes & ::com::sun::star::beans::PropertyAttribute::REMOVABLE )
- try
- {
- // QUESTION: DefaultValue?!
- xContainer->addProperty( pProps[i].Name, pProps[i].Attributes, aValue );
- }
- catch (beans::PropertyExistException const&) {}
- try
{
- // it is possible that the propertysets from XML and binary files differ; we shouldn't break then
- xSet->setPropertyValue( pProps[i].Name, aValue );
+ try
+ {
+ // QUESTION: DefaultValue?!
+ xContainer->addProperty( pProps[i].Name, pProps[i].Attributes, aValue );
+ }
+ catch (beans::PropertyExistException const&) {}
+ try
+ {
+ // it is possible that the propertysets from XML and binary files differ; we shouldn't break then
+ xSet->setPropertyValue( pProps[i].Name, aValue );
+ }
+ catch ( const uno::Exception& ) {}
}
- catch ( const uno::Exception& ) {}
}
// sigh... have to set these manually i'm afraid... wonder why
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index dd0a95ed8ca8..2e8d33d9091c 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -82,8 +82,8 @@ namespace sfx2
_rEvent.Modifiers |= KeyModifier::MOD1;
if ( _rVclEvent.IsMod2() )
_rEvent.Modifiers |= KeyModifier::MOD2;
- if ( _rVclEvent.IsMod3() )
- _rEvent.Modifiers |= KeyModifier::MOD3;
+ if ( _rVclEvent.IsMod3() )
+ _rEvent.Modifiers |= KeyModifier::MOD3;
}
void lcl_initKeyEvent( KeyEvent& rEvent, const ::KeyEvent& rEvt )
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 4a4cfcec82ab..88f87635d9d4 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -555,18 +555,15 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
if ( nId == SID_MAIL_SENDDOC )
eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
- else
- if ( nId == SID_MAIL_SENDDOCASPDF )
+ else if ( nId == SID_MAIL_SENDDOCASPDF )
eResult = aModel.SaveAndSend( xFrame, rtl::OUString( "pdf_Portable_Document_Format" ));
- else
- if ( nId == SID_MAIL_SENDDOCASMS )
+ else if ( nId == SID_MAIL_SENDDOCASMS )
{
aDocType = impl_searchFormatTypeForApp(xFrame, E_MS_DOC);
if (!aDocType.isEmpty())
eResult = aModel.SaveAndSend( xFrame, aDocType );
}
- else
- if ( nId == SID_MAIL_SENDDOCASOOO )
+ else if ( nId == SID_MAIL_SENDDOCASOOO )
{
aDocType = impl_searchFormatTypeForApp(xFrame, E_OOO_DOC);
if (!aDocType.isEmpty())