This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d38f814 Fixed typos (catched -> caught), removed whitespace
d38f814 is described below
commit d38f814df285b0a6d370454feee66a3ecf730beb
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Oct 25 14:40:32 2020 +0100
Fixed typos (catched -> caught), removed whitespace
(cherry picked from commit a633b3ddaa56152ed2fd06b9033bb5e0c341f745)
---
.../source/xsltdialog/typedetectionimport.cxx | 52 ++--
.../source/xsltdialog/xmlfiltertabpagexslt.cxx | 18 +-
main/framework/source/inc/pattern/frame.hxx | 29 +-
.../source/core/sdr/PropertyForward.cxx | 101 +++----
main/reportdesign/source/ui/misc/RptUndo.cxx | 332 ++++++++++-----------
main/sd/source/core/CustomAnimationPreset.cxx | 89 +++---
main/xmloff/source/draw/animimp.cxx | 70 ++---
7 files changed, 346 insertions(+), 345 deletions(-)
diff --git a/main/filter/source/xsltdialog/typedetectionimport.cxx
b/main/filter/source/xsltdialog/typedetectionimport.cxx
index 409da4e..cb13f9e 100644
--- a/main/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/main/filter/source/xsltdialog/typedetectionimport.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -64,7 +64,7 @@ TypeDetectionImporter::~TypeDetectionImporter (void )
}
void TypeDetectionImporter::doImport( Reference< XMultiServiceFactory >& xMSF,
Reference< XInputStream > xIS, XMLFilterVector& rFilters )
-{
+{
try
{
Reference< XParser > xParser(
xMSF->createInstance(OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )
), UNO_QUERY );
@@ -77,7 +77,7 @@ void TypeDetectionImporter::doImport( Reference<
XMultiServiceFactory >& xMSF, R
InputSource source;
source.aInputStream = xIS;
- // start parsing
+ // start parsing
xParser->parseStream( source );
pImporter->fillFilterVector( rFilters );
@@ -85,11 +85,11 @@ void TypeDetectionImporter::doImport( Reference<
XMultiServiceFactory >& xMSF, R
}
catch( Exception& /* e */ )
{
- DBG_ERROR( "TypeDetectionImporter::doImport exception catched!"
);
+ DBG_ERROR( "TypeDetectionImporter::doImport exception caught!"
);
}
}
-void TypeDetectionImporter::fillFilterVector( XMLFilterVector& rFilters )
+void TypeDetectionImporter::fillFilterVector( XMLFilterVector& rFilters )
{
// create filter infos from imported filter nodes
NodeVector::iterator aIter = maFilterNodes.begin();
@@ -150,7 +150,7 @@ Node* TypeDetectionImporter::findTypeNode( const OUString&
rType )
aIter++;
}
-
+
return NULL;
}
@@ -165,8 +165,8 @@ filter_info_impl*
TypeDetectionImporter::createFilterForNode( Node * pNode )
sal_Unicode aComma(',');
- pFilter->maType = getSubdata( 1, aComma, aData );
- pFilter->maDocumentService = getSubdata( 2, aComma, aData );
+ pFilter->maType = getSubdata( 1, aComma, aData );
+ pFilter->maDocumentService = getSubdata( 2, aComma, aData );
OUString aFilterService( getSubdata( 3, aComma, aData ) );
pFilter->maFlags = getSubdata( 4, aComma, aData ).toInt32();
@@ -176,10 +176,10 @@ filter_info_impl*
TypeDetectionImporter::createFilterForNode( Node * pNode )
OUString aFilterUserData( getSubdata( 5, aComma, aData ) );
OUString aAdapterService( getSubdata( 0, aDelim, aFilterUserData ) );
- //Import/ExportService
- pFilter->maImportService = getSubdata( 2, aDelim, aFilterUserData );
- pFilter->maExportService = getSubdata( 3, aDelim, aFilterUserData );
- pFilter->maImportXSLT = getSubdata( 4, aDelim, aFilterUserData );
+ // Import/ExportService
+ pFilter->maImportService = getSubdata( 2, aDelim, aFilterUserData );
+ pFilter->maExportService = getSubdata( 3, aDelim, aFilterUserData );
+ pFilter->maImportXSLT = getSubdata( 4, aDelim, aFilterUserData );
pFilter->maExportXSLT = getSubdata( 5, aDelim, aFilterUserData );
pFilter->maDTD = getSubdata( 6, aDelim, aFilterUserData );
pFilter->maComment = getSubdata( 7, aDelim, aFilterUserData );
@@ -232,24 +232,24 @@ filter_info_impl*
TypeDetectionImporter::createFilterForNode( Node * pNode )
return pFilter;
}
-void SAL_CALL TypeDetectionImporter::startDocument( )
+void SAL_CALL TypeDetectionImporter::startDocument( )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
-void SAL_CALL TypeDetectionImporter::endDocument( )
+void SAL_CALL TypeDetectionImporter::endDocument( )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
-void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName,
const uno::Reference< xml::sax::XAttributeList >& xAttribs )
+void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName,
const uno::Reference< xml::sax::XAttributeList >& xAttribs )
throw(xml::sax::SAXException, uno::RuntimeException)
{
ImportState eNewState = e_Unknown;
if( maStack.empty() )
{
- // #109668# support legacy name as well on import
+ // #109668# support legacy name as well on import
if( aName == sRootNode || aName.equalsAscii("oor:node") )
{
eNewState = e_Root;
@@ -299,11 +299,11 @@ void SAL_CALL TypeDetectionImporter::startElement( const
OUString& aName, const
maStack.push( eNewState );
}
-void SAL_CALL TypeDetectionImporter::endElement( const OUString& /* aName */ )
+void SAL_CALL TypeDetectionImporter::endElement( const OUString& /* aName */ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
- if( !maStack.empty() )
- {
+ if( !maStack.empty() )
+ {
ImportState eCurrentState = maStack.top();
switch( eCurrentState )
{
@@ -335,7 +335,7 @@ void SAL_CALL TypeDetectionImporter::endElement( const
OUString& /* aName */ )
maStack.pop();
}
}
-void SAL_CALL TypeDetectionImporter::characters( const OUString& aChars )
+void SAL_CALL TypeDetectionImporter::characters( const OUString& aChars )
throw(xml::sax::SAXException, uno::RuntimeException)
{
if( !maStack.empty() && maStack.top() == e_Value )
@@ -343,15 +343,15 @@ void SAL_CALL TypeDetectionImporter::characters( const
OUString& aChars )
maValue += aChars;
}
}
-void SAL_CALL TypeDetectionImporter::ignorableWhitespace( const OUString& /*
aWhitespaces */ )
+void SAL_CALL TypeDetectionImporter::ignorableWhitespace( const OUString& /*
aWhitespaces */ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
-void SAL_CALL TypeDetectionImporter::processingInstruction( const OUString& /*
aTarget */, const OUString& /* aData */ )
+void SAL_CALL TypeDetectionImporter::processingInstruction( const OUString& /*
aTarget */, const OUString& /* aData */ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
-void SAL_CALL TypeDetectionImporter::setDocumentLocator( const uno::Reference<
xml::sax::XLocator >& /* xLocator */ )
+void SAL_CALL TypeDetectionImporter::setDocumentLocator( const uno::Reference<
xml::sax::XLocator >& /* xLocator */ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
diff --git a/main/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
b/main/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 3ca7867..50e58d3 100644
--- a/main/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/main/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::lang;
XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr,
const Reference< XMultiServiceFactory >& rxMSF ) :
TabPage( pParent, ResId( RID_XML_FILTER_TABPAGE_XSLT, rResMgr ) ),
-
+
maFTDocType( this, ResId( FT_XML_DOCTYPE, rResMgr ) ),
maEDDocType( this, ResId( ED_XML_DOCTYPE, rResMgr ) ),
@@ -79,7 +79,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent,
ResMgr& rResMgr, co
}
catch(Exception&)
{
- DBG_ERROR( "XMLFilterTabPageXSLT::XMLFilterTabPageXSLT
exception catched!" );
+ DBG_ERROR( "XMLFilterTabPageXSLT::XMLFilterTabPageXSLT
exception caught!" );
}
maPBDTDSchemaBrowse.SetClickHdl( LINK ( this, XMLFilterTabPageXSLT,
ClickBrowseHdl_Impl ) );
@@ -200,9 +200,9 @@ IMPL_LINK ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl,
PushButton *, pButton )
}
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
- com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
-
+ ::sfx2::FileDialogHelper aDlg(
+
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+
aDlg.SetDisplayDirectory( GetURL( *pURLBox ) );
if ( aDlg.Execute() == ERRCODE_NONE )
diff --git a/main/framework/source/inc/pattern/frame.hxx
b/main/framework/source/inc/pattern/frame.hxx
index 6565a33..a3e88a4 100644
--- a/main/framework/source/inc/pattern/frame.hxx
+++ b/main/framework/source/inc/pattern/frame.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -64,7 +64,7 @@ inline css::uno::Reference< css::frame::XModel >
extractFrameModel(const css::un
xController = xFrame->getController();
if (xController.is())
xModel = xController->getModel();
- return xModel;
+ return xModel;
}
//-----------------------------------------------
@@ -76,26 +76,26 @@ inline css::uno::Reference< css::frame::XModel >
extractFrameModel(const css::un
needed interface isn't available) dispose() is tried instead.
Al possible exception are handled inside.
So the user of this method has to look for the return value only.
-
+
@attention The given resource will not be cleared.
But later using of it can produce an exception!
-
+
@param xResource
the object, which should be closed here.
-
+
@param bDelegateOwnerShip
used at the XCloseable->close() method to define
the right owner in case closing failed.
-
+
@return [bool]
- sal_True if closing failed.
+ sal_True if closing failed.
*/
inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >&
xResource ,
sal_Bool
bDelegateOwnerShip)
{
css::uno::Reference< css::util::XCloseable > xClose (xResource,
css::uno::UNO_QUERY);
css::uno::Reference< css::lang::XComponent > xDispose(xResource,
css::uno::UNO_QUERY);
-
+
try
{
if (xClose.is())
@@ -113,14 +113,15 @@ inline sal_Bool closeIt(const css::uno::Reference<
css::uno::XInterface >& xReso
catch(const css::uno::RuntimeException&)
{ throw; } // shouldn't be suppressed!
catch(const css::uno::Exception&)
- { return sal_False; } // ??? We defined to return a boolen value
instead of throwing exceptions ...
- // (OK: RuntimeExceptions shouldn't be catched
inside the core ..)
+ { return sal_False; } // ??? We defined to return a boolen value
instead of throwing exceptions...
+ // (OK: RuntimeExceptions shouldn't be caught
inside the core...)
return sal_True;
}
-
+
} // namespace frame
} // namespace pattern
} // namespace framework
#endif // __FRAMEWORK_PATTERN_FRAME_HXX_
+
diff --git a/main/reportdesign/source/core/sdr/PropertyForward.cxx
b/main/reportdesign/source/core/sdr/PropertyForward.cxx
index 59f787f..738ccb2 100644
--- a/main/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/main/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#include "precompiled_reportdesign.hxx"
#include "PropertyForward.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -38,8 +39,8 @@ namespace rptui
using namespace ::com::sun::star::beans;
using namespace reportdesign;
-DBG_NAME( rpt_OPropertyMediator )
-OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
+DBG_NAME( rpt_OPropertyMediator )
+OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
,const
Reference< XPropertySet>& _xDest
,const
TPropertyNamePair& _aNameMap
,sal_Bool _bReverse)
@@ -49,7 +50,7 @@ OPropertyMediator::OPropertyMediator(const Reference<
XPropertySet>& _xSource
,m_xDest(_xDest)
,m_bInChange(sal_False)
{
- DBG_CTOR( rpt_OPropertyMediator,NULL);
+ DBG_CTOR( rpt_OPropertyMediator,NULL);
osl_incrementInterlockedCount(&m_refCount);
OSL_ENSURE(m_xDest.is(),"Dest is NULL!");
OSL_ENSURE(m_xSource.is(),"Source is NULL!");
@@ -65,15 +66,15 @@ OPropertyMediator::OPropertyMediator(const Reference<
XPropertySet>& _xSource
TPropertyNamePair::iterator aIter =
m_aNameMap.begin();
TPropertyNamePair::iterator aEnd =
m_aNameMap.end();
for (; aIter != aEnd; ++aIter)
- {
- Property aProp =
m_xSourceInfo->getPropertyByName(aIter->first);
- if (0 == (aProp.Attributes & PropertyAttribute::READONLY))
- {
- Any aValue =
_xDest->getPropertyValue(aIter->second.first);
- if ( 0 != (aProp.Attributes &
PropertyAttribute::MAYBEVOID) || aValue.hasValue() )
-
_xSource->setPropertyValue(aIter->first,aIter->second.second->operator()(aIter->second.first,aValue));
- }
- }
+ {
+ Property aProp =
m_xSourceInfo->getPropertyByName(aIter->first);
+ if (0 == (aProp.Attributes &
PropertyAttribute::READONLY))
+ {
+ Any aValue =
_xDest->getPropertyValue(aIter->second.first);
+ if ( 0 != (aProp.Attributes &
PropertyAttribute::MAYBEVOID) || aValue.hasValue() )
+
_xSource->setPropertyValue(aIter->first,aIter->second.second->operator()(aIter->second.first,aValue));
+ }
+ }
}
else
{
@@ -83,12 +84,12 @@ OPropertyMediator::OPropertyMediator(const Reference<
XPropertySet>& _xSource
for (; aIter != aEnd; ++aIter)
_xDest->setPropertyValue(aIter->second.first,aIter->second.second->operator()(aIter->second.first,_xSource->getPropertyValue(aIter->first)));
}
- startListening();
+ startListening();
}
catch(Exception& e)
{
- DBG_UNHANDLED_EXCEPTION();
- (void)e;
+ DBG_UNHANDLED_EXCEPTION();
+ (void)e;
}
} // if ( m_xDest.is() && m_xSource.is() )
osl_decrementInterlockedCount(&m_refCount);
@@ -96,7 +97,7 @@ OPropertyMediator::OPropertyMediator(const Reference<
XPropertySet>& _xSource
//
-----------------------------------------------------------------------------
OPropertyMediator::~OPropertyMediator()
{
- DBG_DTOR( rpt_OPropertyMediator,NULL);
+ DBG_DTOR( rpt_OPropertyMediator,NULL);
}
//
-----------------------------------------------------------------------------
void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent&
evt ) throw(RuntimeException)
@@ -108,7 +109,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const
PropertyChangeEvent& evt
try
{
sal_Bool bDest = (evt.Source == m_xDest);
- Reference<XPropertySet> xProp = bDest ? m_xSource :
m_xDest;
+ Reference<XPropertySet> xProp = bDest ? m_xSource :
m_xDest;
Reference<XPropertySetInfo> xPropInfo = bDest ?
m_xSourceInfo : m_xDestInfo;
if ( xProp.is() )
{
@@ -137,29 +138,29 @@ void SAL_CALL OPropertyMediator::propertyChange( const
PropertyChangeEvent& evt
}
if ( sPropName.getLength() &&
xPropInfo->hasPropertyByName(sPropName) )
xProp->setPropertyValue(sPropName,aFind->second.second->operator()(sPropName,evt.NewValue));
- else if ( evt.PropertyName == PROPERTY_CHARFONTNAME
- || evt.PropertyName ==
PROPERTY_CHARFONTSTYLENAME
- || evt.PropertyName == PROPERTY_CHARSTRIKEOUT
- || evt.PropertyName == PROPERTY_CHARWORDMODE
- || evt.PropertyName == PROPERTY_CHARROTATION
- || evt.PropertyName == PROPERTY_CHARSCALEWIDTH
- || evt.PropertyName == PROPERTY_CHARFONTFAMILY
- || evt.PropertyName ==
PROPERTY_CHARFONTCHARSET
- || evt.PropertyName == PROPERTY_CHARFONTPITCH
- || evt.PropertyName == PROPERTY_CHARHEIGHT
- || evt.PropertyName == PROPERTY_CHARUNDERLINE
- || evt.PropertyName == PROPERTY_CHARWEIGHT
- || evt.PropertyName == PROPERTY_CHARPOSTURE)
- {
-
xProp->setPropertyValue(PROPERTY_FONTDESCRIPTOR,m_xSource->getPropertyValue(PROPERTY_FONTDESCRIPTOR));
- }
+ else if ( evt.PropertyName ==
PROPERTY_CHARFONTNAME
+ ||
evt.PropertyName == PROPERTY_CHARFONTSTYLENAME
+ ||
evt.PropertyName == PROPERTY_CHARSTRIKEOUT
+ ||
evt.PropertyName == PROPERTY_CHARWORDMODE
+ ||
evt.PropertyName == PROPERTY_CHARROTATION
+ ||
evt.PropertyName == PROPERTY_CHARSCALEWIDTH
+ ||
evt.PropertyName == PROPERTY_CHARFONTFAMILY
+ ||
evt.PropertyName == PROPERTY_CHARFONTCHARSET
+ ||
evt.PropertyName == PROPERTY_CHARFONTPITCH
+ ||
evt.PropertyName == PROPERTY_CHARHEIGHT
+ ||
evt.PropertyName == PROPERTY_CHARUNDERLINE
+ ||
evt.PropertyName == PROPERTY_CHARWEIGHT
+ ||
evt.PropertyName == PROPERTY_CHARPOSTURE)
+ {
+
xProp->setPropertyValue(PROPERTY_FONTDESCRIPTOR,m_xSource->getPropertyValue(PROPERTY_FONTDESCRIPTOR));
+ }
}
}
}
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched!");
+ OSL_ENSURE(0,"Exception caught!");
}
m_bInChange = sal_False;
}
@@ -168,32 +169,32 @@ void SAL_CALL OPropertyMediator::propertyChange( const
PropertyChangeEvent& evt
void SAL_CALL OPropertyMediator::disposing( const
::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
- disposing();
+ disposing();
}
//
-----------------------------------------------------------------------------
void SAL_CALL OPropertyMediator::disposing()
{
- stopListening();
- m_xSource.clear();
- m_xSourceInfo.clear();
- m_xDest.clear();
- m_xDestInfo.clear();
+ stopListening();
+ m_xSource.clear();
+ m_xSourceInfo.clear();
+ m_xDest.clear();
+ m_xDestInfo.clear();
}
//
-----------------------------------------------------------------------------
void OPropertyMediator::stopListening()
{
- if ( m_xSource.is() )
+ if ( m_xSource.is() )
m_xSource->removePropertyChangeListener(::rtl::OUString(),
this);
- if ( m_xDest.is() )
- m_xDest->removePropertyChangeListener(::rtl::OUString(), this);
+ if ( m_xDest.is() )
+ m_xDest->removePropertyChangeListener(::rtl::OUString(), this);
}
//
-----------------------------------------------------------------------------
void OPropertyMediator::startListening()
{
- if ( m_xSource.is() )
+ if ( m_xSource.is() )
m_xSource->addPropertyChangeListener(::rtl::OUString(), this);
- if ( m_xDest.is() )
- m_xDest->addPropertyChangeListener(::rtl::OUString(), this);
+ if ( m_xDest.is() )
+ m_xDest->addPropertyChangeListener(::rtl::OUString(), this);
}
//
-----------------------------------------------------------------------------
//........................................................................
diff --git a/main/reportdesign/source/ui/misc/RptUndo.cxx
b/main/reportdesign/source/ui/misc/RptUndo.cxx
index e4de34d..7a7777c 100644
--- a/main/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/main/reportdesign/source/ui/misc/RptUndo.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#include "precompiled_rptui.hxx"
#include "RptUndo.hxx"
@@ -53,72 +54,72 @@ namespace rptui
//----------------------------------------------------------------------------
namespace
{
- void lcl_collectElements(const uno::Reference< report::XSection >&
_xSection,::std::vector< uno::Reference< drawing::XShape> >& _rControls)
- {
- if ( _xSection.is() )
+ void lcl_collectElements(const uno::Reference< report::XSection >&
_xSection,::std::vector< uno::Reference< drawing::XShape> >& _rControls)
+ {
+ if ( _xSection.is() )
{
sal_Int32 nCount = _xSection->getCount();
_rControls.reserve(nCount);
while ( nCount )
{
- uno::Reference< drawing::XShape>
xShape(_xSection->getByIndex(nCount-1),uno::UNO_QUERY);
+ uno::Reference< drawing::XShape>
xShape(_xSection->getByIndex(nCount-1),uno::UNO_QUERY);
_rControls.push_back(xShape);
_xSection->remove(xShape);
--nCount;
}
} // if ( _xSection.is() )
- }
-
//----------------------------------------------------------------------------
- void lcl_insertElements(const uno::Reference< report::XSection >&
_xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls)
- {
- if ( _xSection.is() )
- {
- ::std::vector< uno::Reference< drawing::XShape>
>::const_reverse_iterator aIter = _aControls.rbegin();
- ::std::vector< uno::Reference< drawing::XShape>
>::const_reverse_iterator aEnd = _aControls.rend();
- for (; aIter != aEnd; ++aIter)
- {
- try
- {
- const awt::Point aPos = (*aIter)->getPosition();
- const awt::Size aSize = (*aIter)->getSize();
- _xSection->add(*aIter);
- (*aIter)->setPosition( aPos );
- (*aIter)->setSize( aSize );
- }
- catch(const uno::Exception&)
- {
- OSL_ENSURE(0,"lcl_insertElements:Exception caught!");
- }
- }
- }
- }
-
//----------------------------------------------------------------------------
- void lcl_setValues(const uno::Reference< report::XSection >&
_xSection,const ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >&
_aValues)
- {
- if ( _xSection.is() )
- {
- ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any>
>::const_iterator aIter = _aValues.begin();
- ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any>
>::const_iterator aEnd = _aValues.end();
- for (; aIter != aEnd; ++aIter)
- {
- try
- {
-
_xSection->setPropertyValue(aIter->first,aIter->second);
- }
- catch(const uno::Exception&)
- {
- OSL_ENSURE(0,"lcl_setValues:Exception caught!");
- }
- }
- }
- }
+ }
+
//----------------------------------------------------------------------------
+ void lcl_insertElements(const uno::Reference< report::XSection >&
_xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls)
+ {
+ if ( _xSection.is() )
+ {
+ ::std::vector< uno::Reference< drawing::XShape>
>::const_reverse_iterator aIter = _aControls.rbegin();
+ ::std::vector< uno::Reference< drawing::XShape>
>::const_reverse_iterator aEnd = _aControls.rend();
+ for (; aIter != aEnd; ++aIter)
+ {
+ try
+ {
+ const awt::Point aPos =
(*aIter)->getPosition();
+ const awt::Size aSize =
(*aIter)->getSize();
+ _xSection->add(*aIter);
+ (*aIter)->setPosition( aPos );
+ (*aIter)->setSize( aSize );
+ }
+ catch(const uno::Exception&)
+ {
+
OSL_ENSURE(0,"lcl_insertElements:Exception caught!");
+ }
+ }
+ }
+ }
+
//----------------------------------------------------------------------------
+ void lcl_setValues(const uno::Reference< report::XSection >&
_xSection,const ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >&
_aValues)
+ {
+ if ( _xSection.is() )
+ {
+ ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any>
>::const_iterator aIter = _aValues.begin();
+ ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any>
>::const_iterator aEnd = _aValues.end();
+ for (; aIter != aEnd; ++aIter)
+ {
+ try
+ {
+
_xSection->setPropertyValue(aIter->first,aIter->second);
+ }
+ catch(const uno::Exception&)
+ {
+ OSL_ENSURE(0,"lcl_setValues:Exception
caught!");
+ }
+ }
+ }
+ }
}
//----------------------------------------------------------------------------
-TYPEINIT1( OSectionUndo, OCommentUndoAction );
+TYPEINIT1( OSectionUndo, OCommentUndoAction );
DBG_NAME(rpt_OSectionUndo)
//----------------------------------------------------------------------------
OSectionUndo::OSectionUndo(OReportModel& _rMod
- ,sal_uInt16 _nSlot
+ ,sal_uInt16 _nSlot
,Action _eAction
,sal_uInt16 nCommentID)
: OCommentUndoAction(_rMod,nCommentID)
@@ -126,55 +127,55 @@ OSectionUndo::OSectionUndo(OReportModel& _rMod
,m_nSlot(_nSlot)
,m_bInserted(false)
{
- DBG_CTOR(rpt_OSectionUndo,NULL);
+ DBG_CTOR(rpt_OSectionUndo,NULL);
}
//
-----------------------------------------------------------------------------
OSectionUndo::~OSectionUndo()
{
- if ( !m_bInserted )
- {
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
- ::std::vector< uno::Reference< drawing::XShape> >::iterator aEnd =
m_aControls.end();
- for (::std::vector< uno::Reference< drawing::XShape> >::iterator aIter
= m_aControls.begin(); aIter != aEnd; ++aIter)
- {
- uno::Reference< drawing::XShape> xShape = *aIter;
- rEnv.RemoveElement(xShape);
+ if ( !m_bInserted )
+ {
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ ::std::vector< uno::Reference< drawing::XShape> >::iterator
aEnd = m_aControls.end();
+ for (::std::vector< uno::Reference< drawing::XShape>
>::iterator aIter = m_aControls.begin(); aIter != aEnd; ++aIter)
+ {
+ uno::Reference< drawing::XShape> xShape = *aIter;
+ rEnv.RemoveElement(xShape);
#if OSL_DEBUG_LEVEL > 0
- SvxShape* pShape = SvxShape::getImplementation( xShape );
- SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL;
- OSL_ENSURE( pShape && pShape->HasSdrObjectOwnership() && pObject
&& !pObject->IsInserted(),
- "OSectionUndo::~OSectionUndo: inconsistency in the
shape/object ownership!" );
+ SvxShape* pShape = SvxShape::getImplementation( xShape
);
+ SdrObject* pObject = pShape ? pShape->GetSdrObject() :
NULL;
+ OSL_ENSURE( pShape && pShape->HasSdrObjectOwnership()
&& pObject && !pObject->IsInserted(),
+ "OSectionUndo::~OSectionUndo: inconsistency in
the shape/object ownership!" );
#endif
- try
- {
- comphelper::disposeComponent(xShape);
- }
- catch(uno::Exception)
- {
- OSL_ENSURE(0,"Exception caught!");
- }
- }
- }
- DBG_DTOR(rpt_OSectionUndo,NULL);
+ try
+ {
+ comphelper::disposeComponent(xShape);
+ }
+ catch(uno::Exception)
+ {
+ OSL_ENSURE(0,"Exception caught!");
+ }
+ }
+ }
+ DBG_DTOR(rpt_OSectionUndo,NULL);
}
//
-----------------------------------------------------------------------------
void OSectionUndo::collectControls(const uno::Reference< report::XSection >&
_xSection)
{
- m_aControls.clear();
+ m_aControls.clear();
try
- {
- // copy all properties for restoring
- uno::Reference< beans::XPropertySetInfo> xInfo =
_xSection->getPropertySetInfo();
- uno::Sequence< beans::Property> aSeq = xInfo->getProperties();
- const beans::Property* pIter = aSeq.getConstArray();
- const beans::Property* pEnd = pIter + aSeq.getLength();
- for(;pIter != pEnd;++pIter)
- {
- if ( 0 == (pIter->Attributes & beans::PropertyAttribute::READONLY)
)
- m_aValues.push_back(::std::pair< ::rtl::OUString
,uno::Any>(pIter->Name,_xSection->getPropertyValue(pIter->Name)));
- }
- lcl_collectElements(_xSection,m_aControls);
+ {
+ // copy all properties for restoring
+ uno::Reference< beans::XPropertySetInfo> xInfo =
_xSection->getPropertySetInfo();
+ uno::Sequence< beans::Property> aSeq = xInfo->getProperties();
+ const beans::Property* pIter = aSeq.getConstArray();
+ const beans::Property* pEnd = pIter + aSeq.getLength();
+ for(;pIter != pEnd;++pIter)
+ {
+ if ( 0 == (pIter->Attributes &
beans::PropertyAttribute::READONLY) )
+ m_aValues.push_back(::std::pair<
::rtl::OUString
,uno::Any>(pIter->Name,_xSection->getPropertyValue(pIter->Name)));
+ }
+ lcl_collectElements(_xSection,m_aControls);
}
catch(uno::Exception&)
{
@@ -183,47 +184,47 @@ void OSectionUndo::collectControls(const uno::Reference<
report::XSection >& _xS
//----------------------------------------------------------------------------
void OSectionUndo::Undo()
{
- try
- {
+ try
+ {
switch ( m_eAction )
{
case Inserted:
- implReRemove();
- break;
+ implReRemove();
+ break;
case Removed:
- implReInsert();
- break;
- }
- }
- catch( const Exception& )
- {
- OSL_ENSURE( sal_False, "OSectionUndo::Undo: caught an exception!" );
- }
+ implReInsert();
+ break;
+ }
+ }
+ catch( const Exception& )
+ {
+ OSL_ENSURE( sal_False, "OSectionUndo::Undo: caught an
exception!" );
+ }
}
//----------------------------------------------------------------------------
void OSectionUndo::Redo()
{
- try
- {
- switch ( m_eAction )
+ try
+ {
+ switch ( m_eAction )
{
case Inserted:
- implReInsert();
- break;
+ implReInsert();
+ break;
case Removed:
- implReRemove();
+ implReRemove();
break;
- }
- }
- catch( const Exception& )
- {
- OSL_ENSURE( sal_False, "OSectionUndo::Redo: caught an exception!" );
- }
+ }
+ }
+ catch( const Exception& )
+ {
+ OSL_ENSURE( sal_False, "OSectionUndo::Redo: caught an
exception!" );
+ }
}
//----------------------------------------------------------------------------
-TYPEINIT1( OReportSectionUndo, OSectionUndo );
+TYPEINIT1( OReportSectionUndo, OSectionUndo );
//----------------------------------------------------------------------------
OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -236,7 +237,7 @@ OReportSectionUndo::OReportSectionUndo(OReportModel&
_rMod,sal_uInt16 _nSlot
,m_pMemberFunction(_pMemberFunction)
{
if( m_eAction == Removed )
- collectControls(m_pMemberFunction(&m_aReportHelper));
+ collectControls(m_pMemberFunction(&m_aReportHelper));
}
//
-----------------------------------------------------------------------------
OReportSectionUndo::~OReportSectionUndo()
@@ -248,21 +249,21 @@ void OReportSectionUndo::implReInsert( )
const uno::Sequence< beans::PropertyValue > aArgs;
m_pController->executeChecked(m_nSlot,aArgs);
uno::Reference< report::XSection > xSection =
m_pMemberFunction(&m_aReportHelper);
- lcl_insertElements(xSection,m_aControls);
- lcl_setValues(xSection,m_aValues);
- m_bInserted = true;
+ lcl_insertElements(xSection,m_aControls);
+ lcl_setValues(xSection,m_aValues);
+ m_bInserted = true;
}
//----------------------------------------------------------------------------
void OReportSectionUndo::implReRemove( )
{
- if( m_eAction == Removed )
- collectControls(m_pMemberFunction(&m_aReportHelper));
+ if( m_eAction == Removed )
+ collectControls(m_pMemberFunction(&m_aReportHelper));
const uno::Sequence< beans::PropertyValue > aArgs;
- m_pController->executeChecked(m_nSlot,aArgs);
- m_bInserted = false;
+ m_pController->executeChecked(m_nSlot,aArgs);
+ m_bInserted = false;
}
//----------------------------------------------------------------------------
-TYPEINIT1( OGroupSectionUndo, OSectionUndo );
+TYPEINIT1( OGroupSectionUndo, OSectionUndo );
//----------------------------------------------------------------------------
OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -274,30 +275,30 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel&
_rMod,sal_uInt16 _nSlot
,m_aGroupHelper(_xGroup)
,m_pMemberFunction(_pMemberFunction)
{
- if( m_eAction == Removed )
- {
- uno::Reference< report::XSection > xSection =
m_pMemberFunction(&m_aGroupHelper);
+ if( m_eAction == Removed )
+ {
+ uno::Reference< report::XSection > xSection =
m_pMemberFunction(&m_aGroupHelper);
if ( xSection.is() )
- m_sName = xSection->getName();
- collectControls(xSection);
- }
+ m_sName = xSection->getName();
+ collectControls(xSection);
+ }
}
//----------------------------------------------------------------------------
String OGroupSectionUndo::GetComment() const
{
- if ( !m_sName.getLength() )
- {
- try
- {
- uno::Reference< report::XSection > xSection =
const_cast<OGroupSectionUndo*>(this)->m_pMemberFunction(&const_cast<OGroupSectionUndo*>(this)->m_aGroupHelper);
-
- if ( xSection.is() )
- m_sName = xSection->getName();
- }
- catch(uno::Exception&)
- {}
- }
- return m_strComment + m_sName;
+ if ( !m_sName.getLength() )
+ {
+ try
+ {
+ uno::Reference< report::XSection > xSection =
const_cast<OGroupSectionUndo*>(this)->m_pMemberFunction(&const_cast<OGroupSectionUndo*>(this)->m_aGroupHelper);
+
+ if ( xSection.is() )
+ m_sName = xSection->getName();
+ }
+ catch(uno::Exception&)
+ {}
+ }
+ return m_strComment + m_sName;
}
//----------------------------------------------------------------------------
void OGroupSectionUndo::implReInsert( )
@@ -311,15 +312,15 @@ void OGroupSectionUndo::implReInsert( )
m_pController->executeChecked(m_nSlot,aArgs);
uno::Reference< report::XSection > xSection =
m_pMemberFunction(&m_aGroupHelper);
- lcl_insertElements(xSection,m_aControls);
- lcl_setValues(xSection,m_aValues);
- m_bInserted = true;
+ lcl_insertElements(xSection,m_aControls);
+ lcl_setValues(xSection,m_aValues);
+ m_bInserted = true;
}
//----------------------------------------------------------------------------
void OGroupSectionUndo::implReRemove( )
{
- if( m_eAction == Removed )
- collectControls(m_pMemberFunction(&m_aGroupHelper));
+ if( m_eAction == Removed )
+ collectControls(m_pMemberFunction(&m_aGroupHelper));
uno::Sequence< beans::PropertyValue > aArgs(2);
@@ -327,12 +328,12 @@ void OGroupSectionUndo::implReRemove( )
aArgs[0].Value <<= sal_False;
aArgs[1].Name = PROPERTY_GROUP;
aArgs[1].Value <<= m_aGroupHelper.getGroup();
-
+
m_pController->executeChecked(m_nSlot,aArgs);
- m_bInserted = false;
+ m_bInserted = false;
}
//----------------------------------------------------------------------------
-TYPEINIT1( OGroupUndo, OCommentUndoAction );
+TYPEINIT1( OGroupUndo, OCommentUndoAction );
//----------------------------------------------------------------------------
OGroupUndo::OGroupUndo(OReportModel& _rMod
,sal_uInt16 nCommentID
@@ -355,7 +356,7 @@ void OGroupUndo::implReInsert( )
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched while undoing remove group");
+ OSL_ENSURE(0,"Exception caught while undoing remove group");
}
}
//----------------------------------------------------------------------------
@@ -367,7 +368,7 @@ void OGroupUndo::implReRemove( )
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched while redoing remove group");
+ OSL_ENSURE(0,"Exception caught while redoing remove group");
}
}
//----------------------------------------------------------------------------
@@ -376,14 +377,14 @@ void OGroupUndo::Undo()
switch ( m_eAction )
{
case Inserted:
- implReRemove();
- break;
+ implReRemove();
+ break;
case Removed:
- implReInsert();
- break;
- }
-
+ implReInsert();
+ break;
+ }
+
}
//----------------------------------------------------------------------------
void OGroupUndo::Redo()
@@ -391,17 +392,16 @@ void OGroupUndo::Redo()
switch ( m_eAction )
{
case Inserted:
- implReInsert();
- break;
+ implReInsert();
+ break;
case Removed:
- implReRemove();
+ implReRemove();
break;
- }
+ }
}
//----------------------------------------------------------------------------
//============================================================================
} // rptui
//============================================================================
-
diff --git a/main/sd/source/core/CustomAnimationPreset.cxx
b/main/sd/source/core/CustomAnimationPreset.cxx
index 3763d0a..7d6dda2 100644
--- a/main/sd/source/core/CustomAnimationPreset.cxx
+++ b/main/sd/source/core/CustomAnimationPreset.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -77,8 +77,8 @@ static Reference< XNameAccess > getNodeAccess( const
Reference< XMultiServiceFac
try
{
Sequence< Any > aArgs( 1 );
- PropertyValue aPropValue;
- aPropValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM(
"nodepath" ));
+ PropertyValue aPropValue;
+ aPropValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM(
"nodepath" ));
aPropValue.Value <<= rNodePath;
aArgs[0] <<= aPropValue;
@@ -90,7 +90,7 @@ static Reference< XNameAccess > getNodeAccess( const
Reference< XMultiServiceFac
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::getNodeAccess(), Exception catched!" );
+ DBG_ERROR( "sd::getNodeAccess(), Exception caught!" );
}
return xConfigAccess;
@@ -128,12 +128,12 @@ void implImportLabels( const Reference<
XMultiServiceFactory >& xConfigProvider,
catch( lang::WrappedTargetException& e )
{
(void)e;
- DBG_ERROR( "sd::implImportLabels(), WrappedTargetException
catched!" );
+ DBG_ERROR( "sd::implImportLabels(), WrappedTargetException
caught!" );
}
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::implImportLabels(), Exception catched!" );
+ DBG_ERROR( "sd::implImportLabels(), Exception caught!" );
}
}
@@ -205,7 +205,7 @@ Reference< XAnimationNode > CustomAnimationPreset::create(
const rtl::OUString&
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::create(), exception
catched!" );
+ DBG_ERROR( "sd::CustomAnimationPresets::create(), exception
caught!" );
}
Reference< XAnimationNode > xNode;
@@ -290,7 +290,7 @@ Reference< XAnimationNode > implImportEffects( const
Reference< XMultiServiceFac
// connect parser and filter
xParser->setDocumentHandler( xFilter );
- // finally, parser the stream
+ // finally, parse the stream
xParser->parseStream( aParserInput );
Reference< XAnimationNodeSupplier > xAnimationNodeSupplier(
xFilter, UNO_QUERY );
@@ -299,23 +299,23 @@ Reference< XAnimationNode > implImportEffects( const
Reference< XMultiServiceFac
}
catch( xml::sax::SAXParseException& r )
{
- (void)r;
- DBG_ERROR( "sd::implImportEffects(), SAXParseException
catched!" );
+ (void)r;
+ DBG_ERROR( "sd::implImportEffects(), SAXParseException caught!"
);
}
catch( xml::sax::SAXException& r )
{
- (void)r;
- DBG_ERROR( "sd::implImportEffects(), SAXException catched!" );
+ (void)r;
+ DBG_ERROR( "sd::implImportEffects(), SAXException caught!" );
}
catch( io::IOException& r )
{
- (void)r;
- DBG_ERROR( "sd::implImportEffects(), IOException catched!" );
+ (void)r;
+ DBG_ERROR( "sd::implImportEffects(), IOException caught!" );
}
catch( Exception& r )
{
- (void)r;
- DBG_ERROR( "sd::importEffects(), Exception catched!" );
+ (void)r;
+ DBG_ERROR( "sd::importEffects(), Exception caught!" );
}
return xRootNode;
@@ -333,15 +333,15 @@ void CustomAnimationPresets::importEffects()
if( !xServiceFactory.is() )
return;
- uno::Reference< beans::XPropertySet > xProps( xServiceFactory,
UNO_QUERY );
- uno::Reference< uno::XComponentContext > xContext;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"DefaultContext" ))) >>= xContext;
+ uno::Reference< beans::XPropertySet > xProps( xServiceFactory,
UNO_QUERY );
+ uno::Reference< uno::XComponentContext > xContext;
+ xProps->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
- uno::Reference< util::XMacroExpander > xMacroExpander;
- if( xContext.is() )
- xMacroExpander.set( xContext->getValueByName(
- rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/singletons/com.sun.star.util.theMacroExpander"))),
- UNO_QUERY );
+ uno::Reference< util::XMacroExpander > xMacroExpander;
+ if( xContext.is() )
+ xMacroExpander.set( xContext->getValueByName(
+
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"/singletons/com.sun.star.util.theMacroExpander"))),
+ UNO_QUERY );
Reference< XMultiServiceFactory > xConfigProvider(
xServiceFactory->createInstance(
@@ -370,7 +370,7 @@ void CustomAnimationPresets::importEffects()
{
// cut protocol
rtl::OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1
) );
- // decode uric class chars
+ // decode uri class chars
aMacro = rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8 );
// expand macro string
aURL = xMacroExpander->expandMacros( aMacro );
@@ -401,30 +401,30 @@ void CustomAnimationPresets::importEffects()
maEffectDiscriptorMap[aPresetId] = pDescriptor;
}
- aIter++;
- }
- }
- }
- }
+ aIter++;
+ }
+ }
+ }
+ }
catch( xml::sax::SAXParseException& r )
{
- (void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
SAXParseException catched!" );
+ (void)r;
+ DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
SAXParseException caught!" );
}
catch( xml::sax::SAXException& r )
{
- (void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
SAXException catched!" );
+ (void)r;
+ DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
SAXException caught!" );
}
catch( io::IOException& r )
{
- (void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
IOException catched!" );
+ (void)r;
+ DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
IOException caught!" );
}
catch( Exception& r )
{
- (void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
Exception catched!" );
+ (void)r;
+ DBG_ERROR( "sd::CustomAnimationPresets::importEffects(),
Exception caught!" );
}
}
@@ -469,12 +469,12 @@ void CustomAnimationPresets::importResources()
catch( lang::WrappedTargetException& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::importResources(),
WrappedTargetException catched!" );
+ DBG_ERROR( "sd::CustomAnimationPresets::importResources(),
WrappedTargetException caught!" );
}
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::importResources(),
Exception catched!" );
+ DBG_ERROR( "sd::CustomAnimationPresets::importResources(),
Exception caught!" );
}
}
@@ -538,7 +538,7 @@ void CustomAnimationPresets::importPresets( const
Reference< XMultiServiceFactor
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::importPresets(),
Exception catched!" );
+ DBG_ERROR( "sd::CustomAnimationPresets::importPresets(),
Exception caught!" );
}
#ifdef DEBUG
@@ -663,6 +663,5 @@ Reference< XAnimationNode >
CustomAnimationPresets::getRandomPreset( sal_Int16 n
return xNode;
}
-
}
diff --git a/main/xmloff/source/draw/animimp.cxx
b/main/xmloff/source/draw/animimp.cxx
index 142e25b..4bc8d25 100644
--- a/main/xmloff/source/draw/animimp.cxx
+++ b/main/xmloff/source/draw/animimp.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -63,52 +63,52 @@ using namespace ::xmloff::token;
SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] =
{
- { XML_NONE, EK_none },
- { XML_FADE, EK_fade },
- { XML_MOVE, EK_move },
+ { XML_NONE, EK_none },
+ { XML_FADE, EK_fade },
+ { XML_MOVE, EK_move },
{ XML_STRIPES, EK_stripes },
- { XML_OPEN, EK_open },
+ { XML_OPEN, EK_open },
{ XML_CLOSE, EK_close },
- { XML_DISSOLVE, EK_dissolve },
- { XML_WAVYLINE, EK_wavyline },
+ { XML_DISSOLVE, EK_dissolve },
+ { XML_WAVYLINE, EK_wavyline },
{ XML_RANDOM, EK_random },
{ XML_LINES, EK_lines },
{ XML_LASER, EK_laser },
{ XML_APPEAR, EK_appear },
- { XML_HIDE, EK_hide },
+ { XML_HIDE, EK_hide },
{ XML_MOVE_SHORT, EK_move_short },
- { XML_CHECKERBOARD, EK_checkerboard },
+ { XML_CHECKERBOARD, EK_checkerboard },
{ XML_ROTATE, EK_rotate },
{ XML_STRETCH, EK_stretch },
- { XML_TOKEN_INVALID, 0 }
+ { XML_TOKEN_INVALID, 0 }
};
SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
{
- { XML_NONE, ED_none },
+ { XML_NONE, ED_none },
{ XML_FROM_LEFT, ED_from_left },
- { XML_FROM_TOP, ED_from_top },
+ { XML_FROM_TOP, ED_from_top },
{ XML_FROM_RIGHT, ED_from_right },
{ XML_FROM_BOTTOM, ED_from_bottom },
{ XML_FROM_CENTER, ED_from_center },
{ XML_FROM_UPPER_LEFT, ED_from_upperleft },
- { XML_FROM_UPPER_RIGHT, ED_from_upperright },
+ { XML_FROM_UPPER_RIGHT, ED_from_upperright },
{ XML_FROM_LOWER_LEFT, ED_from_lowerleft },
- { XML_FROM_LOWER_RIGHT, ED_from_lowerright },
+ { XML_FROM_LOWER_RIGHT, ED_from_lowerright },
{ XML_TO_LEFT, ED_to_left },
{ XML_TO_TOP, ED_to_top },
- { XML_TO_RIGHT, ED_to_right },
+ { XML_TO_RIGHT, ED_to_right },
{ XML_TO_BOTTOM, ED_to_bottom },
{ XML_TO_UPPER_LEFT, ED_to_upperleft },
{ XML_TO_UPPER_RIGHT, ED_to_upperright },
{ XML_TO_LOWER_RIGHT, ED_to_lowerright },
{ XML_TO_LOWER_LEFT, ED_to_lowerleft },
- { XML_PATH, ED_path },
- { XML_SPIRAL_INWARD_LEFT, ED_spiral_inward_left },
- { XML_SPIRAL_INWARD_RIGHT,ED_spiral_inward_right },
- { XML_SPIRAL_OUTWARD_LEFT, ED_spiral_outward_left },
- { XML_SPIRAL_OUTWARD_RIGHT, ED_spiral_outward_right },
- { XML_VERTICAL, ED_vertical },
+ { XML_PATH, ED_path },
+ { XML_SPIRAL_INWARD_LEFT, ED_spiral_inward_left },
+ { XML_SPIRAL_INWARD_RIGHT, ED_spiral_inward_right },
+ { XML_SPIRAL_OUTWARD_LEFT, ED_spiral_outward_left },
+ { XML_SPIRAL_OUTWARD_RIGHT, ED_spiral_outward_right },
+ { XML_VERTICAL, ED_vertical },
{ XML_HORIZONTAL, ED_horizontal },
{ XML_TO_CENTER, ED_to_center },
{ XML_CLOCKWISE, ED_clockwise },
@@ -118,9 +118,9 @@ SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
{
- { XML_SLOW, AnimationSpeed_SLOW },
+ { XML_SLOW, AnimationSpeed_SLOW },
{ XML_MEDIUM, AnimationSpeed_MEDIUM },
- { XML_FAST, AnimationSpeed_FAST },
+ { XML_FAST, AnimationSpeed_FAST },
{ XML_TOKEN_INVALID, 0 }
};
@@ -198,7 +198,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind,
XMLEffectDirection eDirecti
case ED_from_center: return
AnimationEffect_ZOOM_OUT_FROM_CENTER;
case ED_spiral_inward_left: return
AnimationEffect_ZOOM_OUT_SPIRAL;
default: return
AnimationEffect_ZOOM_OUT;
- }
+ }
}
else
{
@@ -414,7 +414,7 @@ public:
class XMLAnimationsSoundContext : public SvXMLImportContext
{
- XMLAnimationsEffectContext* mpParent;
+ XMLAnimationsEffectContext* mpParent;
public:
TYPEINFO();
@@ -463,7 +463,7 @@ XMLAnimationsSoundContext::~XMLAnimationsSoundContext()
TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext );
-XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList
>& xAttrList, AnimImpImpl* pImpl )
+XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList
>& xAttrList, AnimImpImpl* pImpl )
: SvXMLImportContext(rImport, nPrfx, rLocalName),
mpImpl( pImpl ),
meKind( XMLE_SHOW ), mbTextEffect( sal_False ),
@@ -615,9 +615,9 @@ void XMLAnimationsEffectContext::EndElement()
aAny <<= (sal_Bool)sal_True;
xSet->setPropertyValue(
mpImpl->msIsAnimation, aAny );
- // #42894# speed is not supported for the old group
animation fallback, so no need to set it
- // aAny <<= meSpeed;
- // xSet->setPropertyValue( mpImpl->msSpeed, aAny );
+ // #42894# speed is not supported for
the old group animation fallback, so no need to set it
+ // aAny <<= meSpeed;
+ // xSet->setPropertyValue(
mpImpl->msSpeed, aAny );
}
else
{
@@ -664,7 +664,7 @@ void XMLAnimationsEffectContext::EndElement()
}
catch( Exception e )
{
- DBG_ERROR( "exception catched while importing animation
information!" );
+ DBG_ERROR( "exception caught while importing animation
information!" );
}
}
@@ -672,7 +672,7 @@ void XMLAnimationsEffectContext::EndElement()
TYPEINIT1( XMLAnimationsContext, SvXMLImportContext );
-XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16
nPrfx, const rtl::OUString& rLocalName,
+XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16
nPrfx, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XAttributeList>& )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
{
@@ -687,5 +687,5 @@ XMLAnimationsContext::~XMLAnimationsContext()
SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16
nPrefix, const ::rtl::OUString& rLocalName,
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return new XMLAnimationsEffectContext( GetImport(), nPrefix,
rLocalName, xAttrList, mpImpl );
+ return new XMLAnimationsEffectContext( GetImport(), nPrefix,
rLocalName, xAttrList, mpImpl );
}
