summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/oox/crypto/DocumentEncryption.hxx2
-rw-r--r--include/oox/drawingml/color.hxx4
-rw-r--r--include/oox/drawingml/shape.hxx2
-rw-r--r--include/oox/export/drawingml.hxx8
-rw-r--r--include/oox/helper/grabbagstack.hxx10
-rw-r--r--include/oox/ppt/comments.hxx2
-rw-r--r--include/oox/vml/vmlshape.hxx2
-rw-r--r--oox/source/crypto/DocumentEncryption.cxx2
-rw-r--r--oox/source/drawingml/color.cxx2
-rw-r--r--oox/source/drawingml/shape.cxx2
-rw-r--r--oox/source/export/drawingml.cxx8
-rw-r--r--oox/source/helper/grabbagstack.cxx10
-rw-r--r--oox/source/helper/storagebase.cxx3
-rw-r--r--oox/source/ppt/comments.cxx3
14 files changed, 31 insertions, 29 deletions
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 4410357bbbad..55e3d12f4c43 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -41,7 +41,7 @@ public:
DocumentEncryption(
com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream,
oox::ole::OleStorage& rOleStorage,
- OUString aPassword);
+ const OUString& aPassword);
bool encrypt();
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index 951e52b82e04..e3522e54ea03 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -61,7 +61,7 @@ public:
/** Sets a scheme color from the a:schemeClr element. */
void setSchemeClr( sal_Int32 nToken );
/** Sets the scheme name from the a:schemeClr element for interoperability purposes */
- void setSchemeName( OUString sSchemeName ) { msSchemeName = sSchemeName; }
+ void setSchemeName( const OUString& sSchemeName ) { msSchemeName = sSchemeName; }
/** Sets a system color from the a:sysClr element. */
void setSysClr( sal_Int32 nToken, sal_Int32 nLastRgb );
/** Sets a palette color index. */
@@ -102,7 +102,7 @@ public:
/** Translates between color transformation tokens and their names */
static OUString getColorTransformationName( sal_Int32 nElement );
/** Translates between color transformation token names and the corresponding token */
- static sal_Int32 getColorTransformationToken( OUString sName );
+ static sal_Int32 getColorTransformationToken( const OUString& sName );
private:
/** Internal helper for getColor(). */
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 911298fcbfa0..2d0cb4560a3e 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -179,7 +179,7 @@ public:
getDiagramDoms() { return maDiagramDoms; }
void setDiagramDoms(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
- core::XmlFilterBase& rFilter, OUString sFragment, OUString sType );
+ core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType );
protected:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index cf2de85e2ad5..b2c8d764b9ef 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -95,10 +95,10 @@ protected:
/// If set, this is the parent of the currently handled shape.
com::sun::star::uno::Reference<com::sun::star::drawing::XShape> m_xParent;
- bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString aName );
+ bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& aName );
bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState,
- OUString aName, ::com::sun::star::beans::PropertyState& eState );
+ const OUString& aName, ::com::sun::star::beans::PropertyState& eState );
const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField );
@@ -123,14 +123,14 @@ public:
OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false);
void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
- void WriteColor( OUString sColorSchemeName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
+ void WriteColor( const OUString& sColorSchemeName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
void WriteColorTransformations( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
void WriteLineArrow( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, sal_Bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID );
void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
- void WriteSolidFill( OUString sSchemeName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
+ void WriteSolidFill( const OUString& sSchemeName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
void WriteSolidFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::awt::Gradient rGradient );
diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx
index 8a7323744506..619964eb666d 100644
--- a/include/oox/helper/grabbagstack.hxx
+++ b/include/oox/helper/grabbagstack.hxx
@@ -34,7 +34,7 @@ private:
GrabBagStackElement mCurrentElement;
public:
- GrabBagStack(OUString aName);
+ GrabBagStack(const OUString& aName);
virtual ~GrabBagStack();
@@ -42,11 +42,11 @@ public:
css::beans::PropertyValue getRootProperty();
- void appendElement(OUString aName, css::uno::Any aAny);
- void push(OUString aKey);
+ void appendElement(const OUString& aName, css::uno::Any aAny);
+ void push(const OUString& aKey);
void pop();
- void addInt32(OUString aElementName, sal_Int32 aIntValue);
- void addString(OUString aElementName, OUString aStringValue);
+ void addInt32(const OUString& aElementName, sal_Int32 aIntValue);
+ void addString(const OUString& aElementName, const OUString& aStringValue);
bool isStackEmpty();
};
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index c32b8f6cc0d7..a44b7da29bac 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -57,7 +57,7 @@ class Comment
OUString text;
::com::sun::star::util::DateTime aDateTime;
- void setDateTime (OUString datetime);
+ void setDateTime (const OUString& datetime);
public:
void setAuthorId(const OUString& _aId)
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 8e0183d9c445..51054259e504 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -286,7 +286,7 @@ class SimpleShape : public ShapeBase
public:
explicit SimpleShape( Drawing& rDrawing, const OUString& rService );
- void setService( OUString aService ) { maService = aService; }
+ void setService( const OUString& aService ) { maService = aService; }
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx
index e0941cfa5d95..8928101a9bc2 100644
--- a/oox/source/crypto/DocumentEncryption.cxx
+++ b/oox/source/crypto/DocumentEncryption.cxx
@@ -25,7 +25,7 @@ using namespace css::uno;
using namespace std;
-DocumentEncryption::DocumentEncryption(Reference< XStream > xDocumentStream, oox::ole::OleStorage& rOleStorage, OUString aPassword) :
+DocumentEncryption::DocumentEncryption(Reference< XStream > xDocumentStream, oox::ole::OleStorage& rOleStorage, const OUString& aPassword) :
mxDocumentStream(xDocumentStream),
mrOleStorage(rOleStorage),
maPassword(aPassword)
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index bebc967db23b..59334492a24b 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -382,7 +382,7 @@ OUString Color::getColorTransformationName( sal_Int32 nElement )
return OUString();
}
-sal_Int32 Color::getColorTransformationToken( OUString sName )
+sal_Int32 Color::getColorTransformationToken( const OUString& sName )
{
if( sName == "red" )
return XML_red;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3487b310f2de..56342dd19903 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1207,7 +1207,7 @@ void Shape::putPropertiesToGrabBag( const Sequence< PropertyValue >& aProperties
}
}
-uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfTypeFromOfficeDoc(core::XmlFilterBase& rFilter, OUString sFragment, OUString sType )
+uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfTypeFromOfficeDoc(core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType )
{
uno::Sequence< uno::Sequence< uno::Any > > xRelListTemp;
sal_Int32 counter = 0;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5f869eef95eb..aeeff2587362 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -123,7 +123,7 @@ void DrawingML::ResetCounters()
mnImageCounter = 1;
}
-bool DrawingML::GetProperty( Reference< XPropertySet > rXPropSet, OUString aName )
+bool DrawingML::GetProperty( Reference< XPropertySet > rXPropSet, const OUString& aName )
{
bool bRetValue = false;
@@ -136,7 +136,7 @@ bool DrawingML::GetProperty( Reference< XPropertySet > rXPropSet, OUString aName
return bRetValue;
}
-bool DrawingML::GetPropertyAndState( Reference< XPropertySet > rXPropSet, Reference< XPropertyState > rXPropState, OUString aName, PropertyState& eState )
+bool DrawingML::GetPropertyAndState( Reference< XPropertySet > rXPropSet, Reference< XPropertyState > rXPropState, const OUString& aName, PropertyState& eState )
{
bool bRetValue = false;
@@ -180,7 +180,7 @@ void DrawingML::WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha )
}
}
-void DrawingML::WriteColor( OUString sColorSchemeName, Sequence< PropertyValue > aTransformations )
+void DrawingML::WriteColor( const OUString& sColorSchemeName, Sequence< PropertyValue > aTransformations )
{
// prevent writing a tag with empty val attribute
if( sColorSchemeName.isEmpty() )
@@ -220,7 +220,7 @@ void DrawingML::WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha )
mpFS->endElementNS( XML_a, XML_solidFill );
}
-void DrawingML::WriteSolidFill( OUString sSchemeName, Sequence< PropertyValue > aTransformations )
+void DrawingML::WriteSolidFill( const OUString& sSchemeName, Sequence< PropertyValue > aTransformations )
{
mpFS->startElementNS( XML_a, XML_solidFill, FSEND );
WriteColor( sSchemeName, aTransformations );
diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx
index b62f5e248a18..a8dbb6cd6e70 100644
--- a/oox/source/helper/grabbagstack.cxx
+++ b/oox/source/helper/grabbagstack.cxx
@@ -17,7 +17,7 @@ namespace oox
using namespace css::beans;
using namespace css::uno;
-GrabBagStack::GrabBagStack(OUString aName)
+GrabBagStack::GrabBagStack(const OUString& aName)
{
mCurrentElement.maName = aName;
}
@@ -54,7 +54,7 @@ PropertyValue GrabBagStack::getRootProperty()
return aProperty;
}
-void GrabBagStack::appendElement(OUString aName, Any aAny)
+void GrabBagStack::appendElement(const OUString& aName, Any aAny)
{
PropertyValue aValue;
aValue.Name = aName;
@@ -62,7 +62,7 @@ void GrabBagStack::appendElement(OUString aName, Any aAny)
mCurrentElement.maPropertyList.push_back(aValue);
}
-void GrabBagStack::push(OUString aKey)
+void GrabBagStack::push(const OUString& aKey)
{
mStack.push(mCurrentElement);
mCurrentElement.maName = aKey;
@@ -83,12 +83,12 @@ void GrabBagStack::pop()
appendElement(aName, makeAny(aSequence));
}
-void GrabBagStack::addInt32(OUString aElementName, sal_Int32 aIntValue)
+void GrabBagStack::addInt32(const OUString& aElementName, sal_Int32 aIntValue)
{
appendElement(aElementName, makeAny(aIntValue));
}
-void GrabBagStack::addString(OUString aElementName, OUString aStringValue)
+void GrabBagStack::addString(const OUString& aElementName, const OUString& aStringValue)
{
appendElement(aElementName, makeAny(aStringValue));
}
diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx
index 0e049c689e58..17deba75b76b 100644
--- a/oox/source/helper/storagebase.cxx
+++ b/oox/source/helper/storagebase.cxx
@@ -37,8 +37,9 @@ using namespace ::com::sun::star::uno;
namespace {
-void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, OUString aFullName )
+void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, const OUString& _aFullName )
{
+ OUString aFullName = _aFullName;
sal_Int32 nSlashPos = aFullName.indexOf( '/' );
// strip leading slashes
diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx
index efeabac0369c..81d22e9c3d7e 100644
--- a/oox/source/ppt/comments.cxx
+++ b/oox/source/ppt/comments.cxx
@@ -30,8 +30,9 @@ void CommentAuthorList::setValues(const CommentAuthorList& list)
}
//DateTime is saved as : 2013-01-10T15:53:26.000
-void Comment::setDateTime (OUString datetime)
+void Comment::setDateTime (const OUString& _datetime)
{
+ OUString datetime = _datetime;
aDateTime.Year = datetime.getToken(0,'-').toInt32();
aDateTime.Month = datetime.getToken(1,'-').toInt32();
aDateTime.Day = datetime.getToken(2,'-').toInt32();