summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-22 15:00:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-22 15:01:05 +0100
commit871426533f7afe31bc451fa6b407b83db8e52827 (patch)
treeed60cee61ebee91994eaffc9c9a3638836ed2ab4 /writerfilter
parent5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff)
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/inc/resourcemodel/WW8ResourceModel.hxx4
-rw-r--r--writerfilter/source/doctok/WW8ResourceModelImpl.cxx2
-rw-r--r--writerfilter/source/doctok/WW8Sttbf.cxx2
-rw-r--r--writerfilter/source/doctok/WW8Sttbf.hxx2
4 files changed, 10 insertions, 0 deletions
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 246b203ce120..f452a83b5536 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -291,7 +291,9 @@ public:
/**
Pointer to a value.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef auto_ptr<Value> Pointer_t;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/**
Returns integer representation of the value.
@@ -336,7 +338,9 @@ public:
class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Sprm
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef auto_ptr<Sprm> Pointer_t;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
enum Kind { UNKNOWN, CHARACTER, PARAGRAPH, TABLE };
/**
Returns id of the SPRM.
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index 008b8624515b..cb3df8354e06 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -375,10 +375,12 @@ WW8Value::Pointer_t createValue(int value)
return WW8Value::Pointer_t(new WW8IntValue(value));
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
WW8Value::Pointer_t createValue(WW8Value::Pointer_t value)
{
return value;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
int WW8StringValue::getInt() const
{
diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx
index c2dc0e4122b6..0989962f3a80 100644
--- a/writerfilter/source/doctok/WW8Sttbf.cxx
+++ b/writerfilter/source/doctok/WW8Sttbf.cxx
@@ -104,10 +104,12 @@ string WW8SttbTableResource::getType() const
return "WW8SttbTableResource";
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
WW8StringProperty::WW8StringProperty(sal_uInt32 nId, WW8StringValue::Pointer_t pValue)
: mnId(nId), mpValue(pValue)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
WW8StringProperty::~WW8StringProperty()
{
diff --git a/writerfilter/source/doctok/WW8Sttbf.hxx b/writerfilter/source/doctok/WW8Sttbf.hxx
index eec815c38283..07f9ff45cf47 100644
--- a/writerfilter/source/doctok/WW8Sttbf.hxx
+++ b/writerfilter/source/doctok/WW8Sttbf.hxx
@@ -107,7 +107,9 @@ class WW8StringProperty : public ::writerfilter::Reference<Properties>
WW8StringValue::Pointer_t mpValue;
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
WW8StringProperty(sal_uInt32 nId, WW8StringValue::Pointer_t pValue);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~WW8StringProperty();
void resolve(Properties & rProperties);