summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-10-16 16:21:48 +0200
committerJan Holesovsky <kendy@collabora.com>2015-10-16 17:13:13 +0200
commit58f036a2b36e8dd515ca7a2169ac7eb5315b3cc6 (patch)
tree21bec8c3f5246474d7efcfbca4d8dfb9cbe5da0b /filter
parent67dd4613f0dd0508383ba0606621b628789e0d4e (diff)
svg export: Some whitespace cleanup, fix typos.
Change-Id: I0de8b5229a83d2ed1ccecbd5608c94881b9baad3 (cherry picked from commit 2cb172582a034dccc40be16f73b369e772c97ecb)
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/svgfilter.cxx59
1 files changed, 28 insertions, 31 deletions
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index e44c37d9136f..58897628252e 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -103,7 +103,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
#ifndef DISABLE_EXPORT
else if( mxSrcDoc.is() )
{
- // #i124608# detext selection
+ // #i124608# detect selection
bool bSelectionOnly = false;
bool bGotSelection(false);
@@ -116,18 +116,14 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
}
}
- uno::Reference< frame::XDesktop2 > xDesktop(frame::Desktop::create(mxContext));
- uno::Reference< frame::XFrame > xFrame(xDesktop->getCurrentFrame(),
- uno::UNO_QUERY_THROW);
- uno::Reference<frame::XController > xController(xFrame->getController(),
- uno::UNO_QUERY_THROW);
+ uno::Reference<frame::XDesktop2> xDesktop(frame::Desktop::create(mxContext));
+ uno::Reference<frame::XFrame> xFrame(xDesktop->getCurrentFrame(), uno::UNO_QUERY_THROW);
+ uno::Reference<frame::XController > xController(xFrame->getController(), uno::UNO_QUERY_THROW);
if( !mSelectedPages.hasElements() )
{
- uno::Reference<drawing::XDrawView > xDrawView(xController,
- uno::UNO_QUERY_THROW);
- uno::Reference<drawing::framework::XControllerManager> xManager(xController,
- uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawView> xDrawView(xController, uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::framework::XControllerManager> xManager(xController, uno::UNO_QUERY_THROW);
uno::Reference<drawing::framework::XConfigurationController> xConfigController(xManager->getConfigurationController());
// which view configuration are we in?
@@ -177,7 +173,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
if( !mSelectedPages.hasElements() )
{
- // apparently failed to glean selection - fallback to current page
+ // apparently failed to clean selection - fallback to current page
mSelectedPages.realloc( 1 );
mSelectedPages[0] = xDrawView->getCurrentPage();
}
@@ -255,30 +251,31 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
// may be useful; it may have happened by error)
bRet = false;
}
- else {
- /*
- * We get all master page that are targeted by at least one draw page.
- * The master page are put in an unordered set.
- */
- ObjectSet aMasterPageTargetSet;
- for( sal_Int32 i = 0; i < mSelectedPages.getLength(); ++i )
+ else
{
- uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( mSelectedPages[i], uno::UNO_QUERY );
- if( xMasterPageTarget.is() )
+ /*
+ * We get all master page that are targeted by at least one draw page.
+ * The master page are put in an unordered set.
+ */
+ ObjectSet aMasterPageTargetSet;
+ for( sal_Int32 i = 0; i < mSelectedPages.getLength(); ++i )
{
- aMasterPageTargetSet.insert( xMasterPageTarget->getMasterPage() );
+ uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( mSelectedPages[i], uno::UNO_QUERY );
+ if( xMasterPageTarget.is() )
+ {
+ aMasterPageTargetSet.insert( xMasterPageTarget->getMasterPage() );
+ }
+ }
+ // Later we move them to a uno::Sequence so we can get them by index
+ mMasterPageTargets.realloc( aMasterPageTargetSet.size() );
+ ObjectSet::const_iterator aElem = aMasterPageTargetSet.begin();
+ for( sal_Int32 i = 0; aElem != aMasterPageTargetSet.end(); ++aElem, ++i)
+ {
+ uno::Reference< drawing::XDrawPage > xMasterPage( *aElem, uno::UNO_QUERY );
+ mMasterPageTargets[i] = xMasterPage;
}
- }
- // Later we move them to a uno::Sequence so we can get them by index
- mMasterPageTargets.realloc( aMasterPageTargetSet.size() );
- ObjectSet::const_iterator aElem = aMasterPageTargetSet.begin();
- for( sal_Int32 i = 0; aElem != aMasterPageTargetSet.end(); ++aElem, ++i)
- {
- uno::Reference< drawing::XDrawPage > xMasterPage( *aElem, uno::UNO_QUERY );
- mMasterPageTargets[i] = xMasterPage;
- }
- bRet = implExport( rDescriptor );
+ bRet = implExport( rDescriptor );
}
}
#endif